[Mapnik-de] [sample-section: 29041]

devnull at gnuher.de devnull at gnuher.de
Do Dez 6 00:11:06 CET 2012


* Revision: 29041
* Author: hind
* Date: 2012-12-05 08:27:07
* Message:
Add some shop key values (books, computer, dry_cleaning, gift, greengrocer, jewelry, mobile_phone, optician, pet)

* Paths:
 A /applications/rendering/mapnik/symbols/shop_optician.p_16.png
 A /applications/rendering/mapnik/symbols/shop_pet.p_16.png
 A /applications/rendering/mapnik/symbols/shop_gift.p_16.png
 A /applications/rendering/mapnik/symbols/shop_books.p_16.png
 A /applications/rendering/mapnik/symbols/shop_computer.p_16.png
 A /applications/rendering/mapnik/symbols/shop_dry_cleaning.p_16.png
 A /applications/rendering/mapnik/symbols/shop_mobile_phone.p_16.png
 A /applications/rendering/mapnik/symbols/shop_jewelry.p_16.png
 M /applications/rendering/mapnik/inc/layer-amenity-points.xml.inc
 A /applications/rendering/mapnik/symbols/shop_greengrocer.p_16.png

* Diff:
Index: symbols/shop_mobile_phone.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_mobile_phone.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_jewelry.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_jewelry.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_pet.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_pet.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_computer.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_computer.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_greengrocer.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_greengrocer.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_optician.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_optician.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_dry_cleaning.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_dry_cleaning.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_books.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_books.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: symbols/shop_gift.p_16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: symbols/shop_gift.p_16.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: inc/layer-amenity-points.xml.inc
===================================================================
--- inc/layer-amenity-points.xml.inc	(revision 29040)
+++ inc/layer-amenity-points.xml.inc	(revision 29041)
@@ -302,16 +302,42 @@
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='bicycle'</Filter>
+      <PointSymbolizer file="&symbols;/shopping_bicycle.p.16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
+      <Filter>[shop]='books'</Filter>
+      <PointSymbolizer file="&symbols;/shop_books.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[shop]='butcher'</Filter>
       <PointSymbolizer file="&symbols;/shop_butcher.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='car'</Filter>
+      <PointSymbolizer file="&symbols;/shopping_car.p.16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
+      <Filter>[shop]='car_repair'</Filter>
+      <PointSymbolizer file="&symbols;/shopping_car_repair.p.16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[shop]='clothes' or [shop]='fashion'</Filter>
       <PointSymbolizer file="&symbols;/shop_clothes.p.16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='computer'</Filter>
+      <PointSymbolizer file="&symbols;/shop_computer.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[shop]='convenience'</Filter>
       <PointSymbolizer file="&symbols;/shop_convenience.p.16.png" placement="interior"/>
     </Rule>
@@ -327,31 +353,51 @@
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='dry_cleaning'</Filter>
+      <PointSymbolizer file="&symbols;/shop_dry_cleaning.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[shop]='florist'</Filter>
       <PointSymbolizer file="&symbols;/florist.p.16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='gift'</Filter>
+      <PointSymbolizer file="&symbols;/shop_gift.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
+      <Filter>[shop]='greengrocer'</Filter>
+      <PointSymbolizer file="&symbols;/shop_greengrocer.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[shop]='hairdresser'</Filter>
       <PointSymbolizer file="&symbols;/shop_hairdresser.p.16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
-      <Filter>[shop]='car'</Filter>
-      <PointSymbolizer file="&symbols;/shopping_car.p.16.png" placement="interior"/>
+      <Filter>[shop]='jewelry'</Filter>
+      <PointSymbolizer file="&symbols;/shop_jewelry.p_16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
-      <Filter>[shop]='car_repair'</Filter>
-      <PointSymbolizer file="&symbols;/shopping_car_repair.p.16.png" placement="interior"/>
+      <Filter>[shop]='mobile_phone'</Filter>
+      <PointSymbolizer file="&symbols;/shop_mobile_phone.p_16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
-      <Filter>[shop]='bicycle'</Filter>
-      <PointSymbolizer file="&symbols;/shopping_bicycle.p.16.png" placement="interior"/>
+      <Filter>[shop]='optician'</Filter>
+      <PointSymbolizer file="&symbols;/shop_optician.p_16.png" placement="interior"/>
     </Rule>
     <Rule>
       &maxscale_zoom17;
+      <Filter>[shop]='pet'</Filter>
+      <PointSymbolizer file="&symbols;/shop_pet.p_16.png" placement="interior"/>
+    </Rule>
+    <Rule>
+      &maxscale_zoom17;
       <Filter>[leisure]='playground'</Filter>
       <PointSymbolizer file="&symbols;/playground.p.20.png" placement="interior"/>
     </Rule>