organicmaps/kothic
13
Fork 0
Code Issues Pull requests 2 Projects Releases Wiki Activity Actions

Support for nicer housenumber rotation

Browse source
This commit is contained in:
Komzpa 2011-11-06 16:30:38 +02:00
parent 604c8fe3d7
commit 4f0efb6c1a
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/komap.py
View file

@ -698,8 +698,8 @@ if options.renderer == "mapnik":
ST_Translate(
ST_Rotate(
ST_GeomFromEWKT('SRID=900913;LINESTRING(-50 0, 50 0)'),
-1*ST_Azimuth(ST_PointN(ST_ShortestLine(l.way, h.way),1),
ST_PointN(ST_ShortestLine(l.way, h.way),2)
-1*ST_Azimuth(ST_PointN(ST_ShortestLine(l.way, ST_PointOnSurface(h.way)),1),
ST_PointN(ST_ShortestLine(l.way, ST_PointOnSurface(h.way)),2)
)
),
ST_X(ST_PointOnSurface(ST_Buffer(h.way,0.1))),
@ -710,7 +710,31 @@ if options.renderer == "mapnik":
as way
from planet_osm_line l
where
l.way && ST_Expand(h.way, 300) and
l.way && ST_Expand(h.way, 600) and
l."name" = h."addr:street" and
l.highway is not NULL and
l."name" is not NULL
order by ST_Distance(ST_Buffer(h.way,0.1), l.way) asc
limit 1
),
(select
ST_Intersection(
ST_Translate(
ST_Rotate(
ST_GeomFromEWKT('SRID=900913;LINESTRING(-50 0, 50 0)'),
-1*ST_Azimuth(ST_PointN(ST_ShortestLine(l.way, ST_PointOnSurface(h.way)),1),
ST_PointN(ST_ShortestLine(l.way, ST_PointOnSurface(h.way)),2)
)
),
ST_X(ST_PointOnSurface(ST_Buffer(h.way,0.1))),
ST_Y(ST_PointOnSurface(ST_Buffer(h.way,0.1)))
),
ST_Buffer(h.way,20)
)
as way
from planet_osm_polygon l
where
l.way && ST_Expand(h.way, 600) and
l."name" = h."addr:street" and
l.highway is not NULL and
l."name" is not NULL