From ab8b53e029b4cd5ea1fc552d83810063e54784dd Mon Sep 17 00:00:00 2001 From: Borys Jurgiel Date: Fri, 12 Apr 2013 10:52:30 +0300 Subject: [PATCH] Update default symbol set: more symbols from Anita, lock colour in bottom layer of road symbols, include symbology-ng-style.db instead of the depreciated xml in OsGeo4W --- ms-windows/osgeo4w/package.cmd | 2 +- resources/symbology-ng-style.db | Bin 51200 -> 84992 bytes resources/symbology-ng-style.xml | 771 ++++++++++++++++++++++++++++--- 3 files changed, 707 insertions(+), 66 deletions(-) diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index 268f346a576..67f4f9d14bf 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -204,7 +204,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^ "apps/%PACKAGENAME%/resources/qgis.db" ^ "apps/%PACKAGENAME%/resources/spatialite.db" ^ "apps/%PACKAGENAME%/resources/srs.db" ^ - "apps/%PACKAGENAME%/resources/symbology-ng-style.xml" ^ + "apps/%PACKAGENAME%/resources/symbology-ng-style.db" ^ "apps/%PACKAGENAME%/svg/" ^ "apps/%PACKAGENAME%/cpt-city-qgis-min/" ^ "apps/%PACKAGENAME%/crssync.exe" ^ diff --git a/resources/symbology-ng-style.db b/resources/symbology-ng-style.db index e325ef01c035d9f8872f434170829cd1a12a2429..130aa0b6782a23152d4630c27fa38bfc63bab21c 100644 GIT binary patch literal 84992 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 delta 4700 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 diff --git a/resources/symbology-ng-style.xml b/resources/symbology-ng-style.xml index 7af1c43ec7c..2d7905321c6 100644 --- a/resources/symbology-ng-style.xml +++ b/resources/symbology-ng-style.xml @@ -1,656 +1,1270 @@ - + - + + + + - + + + + - + + + + - + + + + - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - + + + + - - + + + + + + + + - + + + + - + + + + - - + + + + + + + + - + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - + + + + - - + + + + + + + + - + + + + - + + + + - - + + + + + + + + - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + - - + + + + + + + + - - + + + + + + + + - + + + + - - + + + + + + + + - + + + + - + + + + + + + + + + + + + + + - + - + - + + + + + + - + - + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -658,135 +1272,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +