summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjandegr <jandegr@users.noreply.github.com>2017-05-25 07:41:57 +0200
committerGitHub <noreply@github.com>2017-05-25 07:41:57 +0200
commitca063ac04f2bf6cc7bef41714399dd13c2d39d51 (patch)
treef6775578e2bb75cde3b09931e807f9ba41bcfa85
parentdca7893c1d03f3107a92978cfd3d16165d49abff (diff)
downloadnavit-revert-258-MoreCommonLandusePolygons.tar.gz
Revert "Add some more common landuse polygons"revert-258-MoreCommonLandusePolygons
-rw-r--r--navit/maptool/osm.c7
-rw-r--r--navit/navit_shipped.xml16
2 files changed, 1 insertions, 22 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 19608915b..ac8dc3e89 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -685,13 +685,6 @@ static char *attrmap={
"w landuse=retail poly_retail\n"
"w landuse=village_green poly_village_green\n"
"w landuse=vineyard poly_farm\n"
- "w landuse=depot poly_depot\n"
- "w landuse=garages poly_garages\n"
- "w landuse=greenhouse_horticulture poly_greenhouse\n"
- "w landuse=orchard poly_orchard\n"
- "w landuse=plant_nursery poly_plantnursery\n"
- "w landuse=port poly_port\n"
- "w landuse=salt_pond poly_saltpond\n"
"w leisure=common poly_common\n"
"w leisure=fishing poly_fishing\n"
"w leisure=garden poly_garden\n"
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 587cabc66..d3785c645 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -465,9 +465,7 @@ Waypoint</text></img>
<itemgra item_types="poly_theme_park" order="10-"><polygon color="#01a36c"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_water_park" order="10-"><polygon color="#8cc1c8"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_zoo" order="10-"><polygon color="#ccbda5"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_depot" order="10-"><polygon color="#c2b098"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_railway" order="10-"><polygon color="#b3b9c5"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_port" order="10-"><polygon color="#8188a0"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_marina" order="10-"><polygon color="#aac4d2"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_commercial" order="10-"><polygon color="#eaeed3"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_retail" order="10-"><polygon color="#d6b690"/><text text_size="5"/></itemgra>
@@ -501,9 +499,6 @@ Waypoint</text></img>
<polygon color="#8ec78d"/>
<text text_size="5"/>
</itemgra>
- <itemgra item_types="poly_greenhouse" order="10-"><polygon color="#f9e8cb"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_orchard" order="10-"><polygon color="#9edc90"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_plantnursery" order="10-"><polygon color="#addea2"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_farm" order="0-">
<polygon color="#c7f1a3"/>
<polyline color="#79c691"/>
@@ -631,7 +626,6 @@ Waypoint</text></img>
<polygon color="#ffff00"/>
<polyline color="#a0a0a0" width="3"/>
</itemgra>
- <itemgra item_types="poly_saltpond" order="10-"><polygon color="#d7804a"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
<polygon color="#82c8ea"/>
<polyline color="#5096b8"/>
@@ -701,7 +695,6 @@ Waypoint</text></img>
<itemgra item_types="poly_sports_stadium" order="10-"><polygon color="#6eb85d"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_sports_track" order="10-"><polygon color="#b6554e"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_barracks" order="10-"><polygon color="#b6a6a6"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_garages" order="10-"><polygon color="#deddcc"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_building" order="0-">
<polygon color="#b6a6a6"/>
</itemgra>
@@ -2266,7 +2259,7 @@ Waypoint</text></img>
</itemgra>
</cursor>
- <layer name="polygons"><!-- Colors based on Car layout; R/34 G/8 B/9 -->
+ <layer name="polygons">
<itemgra item_types="image" order="0-">
<image/>
</itemgra>
@@ -2285,9 +2278,7 @@ Waypoint</text></img>
<itemgra item_types="poly_theme_park" order="10-"><polygon color="#00150b"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_water_park" order="10-"><polygon color="#041915"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_zoo" order="10-"><polygon color="#061811"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_depot" order="10-"><polygon color="#051610"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_railway" order="10-"><polygon color="#051815"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_port" order="10-"><polygon color="#031111"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_marina" order="10-"><polygon color="#051916"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_commercial" order="10-"><polygon color="#071f16"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_retail" order="10-"><polygon color="#06170f"/><text text_size="5"/></itemgra>
@@ -2321,9 +2312,6 @@ Waypoint</text></img>
<polygon color="#041a06"/>
<text color="#55c4bd" background_color="#000000" text_size="5"/>
</itemgra>
- <itemgra item_types="poly_greenhouse" order="10-"><polygon color="#071d16"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_orchard" order="10-"><polygon color="#041b10"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_plantnursery" order="10-"><polygon color="#051b12"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_farm" order="0-">
<polygon color="#041a06"/>
<text color="#55c4bd" background_color="#000000" text_size="5"/>
@@ -2432,7 +2420,6 @@ Waypoint</text></img>
<polygon color="#c5c300"/>
<polyline color="#a0a0a0" width="3"/>
</itemgra>
- <itemgra item_types="poly_saltpond" order="10-"><polygon color="#061008"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
<polygon color="#010321"/>
<text color="#55c4bd" background_color="#000000" text_size="5"/>
@@ -2501,7 +2488,6 @@ Waypoint</text></img>
<itemgra item_types="poly_sports_stadium" order="10-"><polygon color="#03180a"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_sports_track" order="10-"><polygon color="#050b08"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_barracks" order="10-"><polygon color="#051511"/><text text_size="5"/></itemgra>
- <itemgra item_types="poly_garages" order="10-"><polygon color="#061b16"/><text text_size="5"/></itemgra>
<itemgra item_types="poly_building" order="8-">
<polygon color="#282424"/>
</itemgra>