From 224e770afeb43b857c86c717a43f3cedb30d1554 Mon Sep 17 00:00:00 2001 From: Stefan Wildemann Date: Fri, 1 May 2020 12:39:13 +0200 Subject: add:layout:add textures for quarry and scrub. - Add textures for quarry and scrub. - Use mapnik carto style colors for quarry and scrub - Use smaller more repetitive textures overall that greatly improve drawing performance. Difference is hardly noticeable visually. --- navit/navit_layout_car_shipped.xml | 10 +++--- navit/textures/quarry.svg | 66 ++++++++++++++++++++++++++++++++++++++ navit/textures/scrub.svg | 64 ++++++++++++++++++++++++++++++++++++ navit/textures/wetland.svg | 51 ++++++++++++++++++++++++++--- navit/textures/wood.svg | 51 +++++++++++++++++++++++++---- 5 files changed, 226 insertions(+), 16 deletions(-) create mode 100644 navit/textures/quarry.svg create mode 100644 navit/textures/scrub.svg diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml index c8c98ef06..f9966f2c8 100644 --- a/navit/navit_layout_car_shipped.xml +++ b/navit/navit_layout_car_shipped.xml @@ -143,7 +143,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -267,7 +267,7 @@ - + diff --git a/navit/textures/quarry.svg b/navit/textures/quarry.svg new file mode 100644 index 000000000..1de09a22c --- /dev/null +++ b/navit/textures/quarry.svg @@ -0,0 +1,66 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/navit/textures/scrub.svg b/navit/textures/scrub.svg new file mode 100644 index 000000000..3e0d18522 --- /dev/null +++ b/navit/textures/scrub.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/navit/textures/wetland.svg b/navit/textures/wetland.svg index 08655517b..2c84b04f1 100644 --- a/navit/textures/wetland.svg +++ b/navit/textures/wetland.svg @@ -5,11 +5,52 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - height="256" - width="256" - id="Svg"> + height="50" + width="50" + id="Svg" + sodipodi:docname="wetland.svg" + inkscape:version="0.92.4 5da689c313, 2019-01-14"> + + + + image/svg+xml + + + + + + + + d="m 16.440678,1 v 1 h 7 V 1 Z M 5,3 v 1 h 7 V 3 Z m 33,0 v 1 h 7 V 3 Z M 0,5.9491525 v 1 h 1 v -1 z M 26,5 v 1 h 7 V 5 Z M 3,8 v 1 h 7 V 8 Z m 12,0 v 1 h 7 V 8 Z M 43.932203,5.9661017 v 1 l 6.050848,-0.067797 v -1 C 48.317317,5.230706 47.126798,5.1048404 43.932203,5.9661017 Z M 31,10 v 1 h 7 V 10 Z M 2.1016949,12.288136 v 1 l 7.0169492,0.135593 v -1 z M 19,12 v 1 h 7 v -1 z m 21,0 v 1 h 7 V 12 Z M 9,15 v 1 h 7 v -1 z m 21,1 v 1 h 7 V 16 Z M 0,17 v 1 h 5 v -1 z m 17,1 v 1 h 7 v -1 z m 25.559322,-0.610166 v 1 l 6.118644,-0.0678 v -1 z M 6,21 v 1 h 7 v -1 z m 20,1 v 1 h 7 v -1 z m 12,0 v 1 h 7 V 22 Z M 2.3728814,24.355932 v 1 l 6.5762712,0.20339 v -1 z M 16,24 v 1 h 7 v -1 z m -7,4 v 1 h 7 v -1 z m 16,0 v 1 h 7 v -1 z m 15,0 v 1 h 7 V 28 Z M 1,31 v 1 h 7 v -1 z m 32,0 v 1 h 7 v -1 z m -16,1 v 1 h 7 v -1 z m 8,3 v 1 h 7 v -1 z m 15,0 v 1 h 7 V 35 Z M 2,38 v 1 h 7 v -1 z m 14,0 v 1 h 7 v -1 z m 17,1 v 1 h 7 V 39 Z M 3,42 v 1 h 7 v -1 z m 21,0 v 1 h 7 v -1 z m 16.474576,0.474576 v 1 h 7 v -1 z M 14,44 v 1 h 7 v -1 z m 20,2 v 1 h 7 V 46 Z M 2,47 v 1 h 7 v -1 z m 23.033898,1.932203 v 1 h 7 v -1 z" + style="fill:#4aa5fa;fill-opacity:1" + id="path35324" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /> diff --git a/navit/textures/wood.svg b/navit/textures/wood.svg index 91578266f..a6f8f7d39 100644 --- a/navit/textures/wood.svg +++ b/navit/textures/wood.svg @@ -5,10 +5,34 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - height="256" - width="256" - id="Svg"> + height="100" + width="100" + id="Svg" + sodipodi:docname="wood.svg" + inkscape:version="0.92.4 5da689c313, 2019-01-14"> + @@ -17,6 +41,7 @@ image/svg+xml + @@ -24,16 +49,30 @@ id="defs3" /> + d="m 46.371871,3.0512518 -3,8.0000002 v 1 h 3 v 4 h 1 v -4 h 3 v -1 l -3,-8.0000002 z m 0.5,1 2.5,7.0000002 h -5 z M 82.312872,18.38975 c -1.972095,0 -3.5,1.83548 -3.5,4 0,1.97579 1.278087,3.65969 3,3.94141 v 5.05859 h 1 v -5.05859 c 1.721913,-0.28172 3,-1.96562 3,-3.94141 0,-2.16452 -1.527905,-4 -3.5,-4 z m -53.871871,1.915375 -3,8 v 1 h 3 v 4 h 1 v -4 h 3 v -1 l -3,-8 z M 82.312872,19.38975 c 1.341598,0 2.5,1.29875 2.5,3 0,1.70125 -1.158402,3 -2.5,3 -1.341598,0 -2.5,-1.29875 -2.5,-3 0,-1.70125 1.158402,-3 2.5,-3 z m -53.371871,1.915375 2.5,7 h -5 z m 22.871871,16.084625 -3,8 v 1 h 3 v 4 h 1 v -4 h 3 v -1 l -3,-8 z m 0.5,1 2.5,7 h -5 z m -42.4999995,12 -3,8 v 1 h 3 v 4 h 0.9999995 v -4 h 3 v -1 l -3,-8 z m 0.4999995,1 2.5,7 H 7.8128725 Z m 63.5,3 -3,8 v 1 h 3 v 4 h 1 v -4 h 3 v -1 l -3,-8 z m 0.5,1 2.5,7 h -5 z m -34,8 c -1.972095,0 -3.5,1.83548 -3.5,4 0,1.97579 1.278087,3.65969 3,3.94141 v 5.05859 h 1 v -5.05859 c 1.721913,-0.28172 3,-1.96562 3,-3.94141 0,-2.16452 -1.527905,-4 -3.5,-4 z m 0,1 c 1.341598,0 2.5,1.29875 2.5,3 0,1.70125 -1.158402,3 -2.5,3 -1.341598,0 -2.5,-1.29875 -2.5,-3 0,-1.70125 1.158402,-3 2.5,-3 z m 52.541118,7.507747 c -1.97209,0 -3.499998,1.83548 -3.499998,4 0,1.97579 1.278088,3.65969 2.999998,3.94141 v 5.05859 h 1 v -5.05859 c 1.72191,-0.28172 3,-1.96562 3,-3.94141 0,-2.16452 -1.52791,-4 -3.5,-4 z m 0,1 c 1.3416,0 2.5,1.29875 2.5,3 0,1.70125 -1.1584,3 -2.5,3 -1.3416,0 -2.499998,-1.29875 -2.499998,-3 0,-1.70125 1.158398,-3 2.499998,-3 z m -76.041118,10.492253 -3,8 v 1 h 3 v 4 h 1 v -4 h 3 v -1 l -3,-8 z m 0.5,1 2.5,7 h -5 z" + style="fill:#6b8d5e" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccssccccsscccccccccccssssscccccccccccccccccccccccccccccccccccccccccccccccccssccccsssssssssccccsssssssccccccccccccccc" /> Created with Snap + + -- cgit v1.2.1