Hi Gerd
This patch moves the contents of inc/ landuse_points, landuse_polygons,
water_lines, water_points and water_polygons inline and deletes rules
if they have already occurred in the main file. IE there shouldn't be
any change in meaning.
After applying, you need to svn delete the above inc/ files
Regards
Ticker
On Fri, 2018-09-21 at 15:49 +0000, Gerd Petermann wrote:
> Hi Ticker,
>
> please post a patch with your suggested improvements.
>
> Gerd
>
> ________________________________________
> Von: mkgmap-dev <mkgmap-dev-boun...@lists.mkgmap.org.uk> im Auftrag
> von Steve Ratcliffe <st...@parabola.me.uk>
> Gesendet: Freitag, 21. September 2018 16:07
> An: mkgmap-dev@lists.mkgmap.org.uk
> Betreff: Re: [mkgmap-dev] Lake Garda... is empty
>
> Hi Gerd
>
> > @Steve: I don't know why you created these includes. I also think
> > it would be easier to have the rules within the polygons file.
>
> No problem - if it is easier to have them within the file, then move
> them.
>
> Steve
> _______________________________________________
> mkgmap-dev mailing list
> mkgmap-dev@lists.mkgmap.org.uk
> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
> _______________________________________________
> mkgmap-dev mailing list
> mkgmap-dev@lists.mkgmap.org.uk
> http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
Index: resources/styles/default/lines
===================================================================
--- resources/styles/default/lines (revision 4243)
+++ resources/styles/default/lines (working copy)
@@ -221,7 +221,18 @@
boundary=national [0x1e resolution 17]
boundary=political [0x1c resolution 19]
-include 'inc/water_lines';
+route=ferry {set mkgmap:numbers = false }
+route=ferry & (motorcar=no | motor_vehicle=no) {add mkgmap:ferry=1} [0x1b road_class=0 road_speed=0 resolution 23]
+route=ferry {add mkgmap:ferry=1} [0x1b road_class=3 road_speed=0 resolution 19]
+
+(waterway=river | waterway=canal) & intermittent=yes [0x26 resolution 20]
+(waterway=stream | waterway=drain) & intermittent=yes [0x10A02 resolution 22]
+
+waterway=canal [0x1f resolution 21]
+waterway=river [0x1f resolution 18]
+waterway=rapids|waterway=waterfall [0x1f resolution 22]
+waterway=stream | waterway=drain [0x18 resolution 22]
+
include 'inc/contour_lines';
<finalize>
Index: resources/styles/default/points
===================================================================
--- resources/styles/default/points (revision 4243)
+++ resources/styles/default/points (working copy)
@@ -294,10 +294,20 @@
barrier=bollard | barrier=bus_trap | barrier=gate [0x660f resolution 24]
barrier=block | barrier=cycle_barrier | barrier=stile | barrier=kissing_gate [0x660f resolution 24]
-include 'inc/water_points';
-include 'inc/landuse_points';
+landuse=basin|landuse=reservoir [0x650f resolution 24]
+natural=beach [0x6604 resolution 24]
+natural=glacier [0x650a resolution 24]
+natural=spring [0x6511 resolution 24]
+natural=stream [0x6512 resolution 24]
+natural=water & name=* [0x6603 resolution 24]
+natural=waterfall | waterway=waterfall [0x6508 resolution 24]
+natural=wetland & name=* [0x6513 resolution 24]
+
+landuse=cemetery|landuse=cemetary|amenity=grave_yard [0x6403 resolution 24]
+(landuse=wood|landuse=forest|natural=wood) & name=* [0x6618 resolution 24]
+
<finalize>
# The finalizer section is executed for each element when a rule with an element type matches
name=* { name '${name}' }
-include 'inc/address';
\ No newline at end of file
+include 'inc/address';
Index: resources/styles/default/polygons
===================================================================
--- resources/styles/default/polygons (revision 4243)
+++ resources/styles/default/polygons (working copy)
@@ -63,9 +63,48 @@
historic=museum | historic=memorial [0x1e resolution 21]
historic=archaeological_site | historic=ruins [0x1e resolution 21]
-include 'inc/water_polygons';
-include 'inc/landuse_polygons';
+landuse=basin [0x3f resolution 20]
+(landuse=reservoir | (natural=water & water=reservoir)) [0x3f resolution 20]
+natural=bay [0x3d resolution 18]
+natural=glacier [0x4d resolution 18]
+natural=marsh [0x51 resolution 20]
+natural=mud [0x51 resolution 20]
+natural=wetland [0x51 resolution 20]
+natural=water [0x3c resolution 18]
+natural=waterfall | waterway=waterfall [0x47 resolution 21]
+natural=sea { add mkgmap:skipSizeFilter=true; set mkgmap:drawLevel=2 } [0x32 resolution 10]
+
+waterway=riverbank [0x46 resolution 20]
+
+landuse=allotments [0x4e resolution 21]
+landuse=cemetery|landuse=cemetary|amenity=grave_yard [0x1a resolution 21]
+landuse=commercial [0x0c resolution 19]
+landuse=construction [0x0c resolution 21]
+landuse=farm |landuse=farmland [0x4e resolution 20]
+landuse=farmyard [0x10 resolution 22]
+landuse=forest|landuse=wood [0x50 resolution 20]
+landuse=greenfield [0x17 resolution 20]
+landuse=meadow | landuse=grass [0x17 resolution 19]
+landuse=military [0x04 resolution 19]
+landuse=quarry [0x0c resolution 19]
+landuse=recreation_ground [0x19 resolution 19]
+# dedicate resolution 24 for building=* instead of related landuse=*
+landuse=industrial [0x0c resolution 23-19]
+landuse=residential [0x10 resolution 23-19]
+landuse=retail [0x08 resolution 23-20]
+landuse=village_green [0x17 resolution 20]
+landuse=vineyard [0x4e resolution 20]
+landuse=orchard [0x4e resolution 20]
+
+military=airfield [0x04 resolution 20]
+military=barracks [0x04 resolution 23]
+military=danger_area [0x04 resolution 20]
+military=range [0x04 resolution 20]
+
+natural=scrub [0x4f resolution 20]
+natural=wood [0x50 resolution 20]
+
# building tag should be last
(building=* | amenity=*) & area!=no & amenity!=grave_yard [0x13 resolution 24]
tourism=* & area!=no & waterway!=* [0x1f resolution 24]
_______________________________________________
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
