midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix pdf export, fix feature switches

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-07-28 02:51:07 +02:00
parent 6cd75a8260
commit ede67ca58c
19 changed files with 390 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

68
assets/svg/download.svg
View file

@ -1,3 +1,67 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.08 8.86C8.13 8.53 8.24 8.24 8.38 7.99C8.52 7.74 8.72 7.53 8.97 7.37C9.21 7.22 9.51 7.15 9.88 7.14C10.11 7.15 10.32 7.19 10.51 7.27C10.71 7.36 10.89 7.48 11.03 7.63C11.17 7.78 11.28 7.96 11.37 8.16C11.46 8.36 11.5 8.58 11.51 8.8H13.3C13.28 8.33 13.19 7.9 13.02 7.51C12.85 7.12 12.62 6.78 12.32 6.5C12.02 6.22 11.66 6 11.24 5.84C10.82 5.68 10.36 5.61 9.85 5.61C9.2 5.61 8.63 5.72 8.15 5.95C7.67 6.18 7.27 6.48 6.95 6.87C6.63 7.26 6.39 7.71 6.24 8.23C6.09 8.75 6 9.29 6 9.87V10.14C6 10.72 6.08 11.26 6.23 11.78C6.38 12.3 6.62 12.75 6.94 13.13C7.26 13.51 7.66 13.82 8.14 14.04C8.62 14.26 9.19 14.38 9.84 14.38C10.31 14.38 10.75 14.3 11.16 14.15C11.57 14 11.93 13.79 12.24 13.52C12.55 13.25 12.8 12.94 12.98 12.58C13.16 12.22 13.27 11.84 13.28 11.43H11.49C11.48 11.64 11.43 11.83 11.34 12.01C11.25 12.19 11.13 12.34 10.98 12.47C10.83 12.6 10.66 12.7 10.46 12.77C10.27 12.84 10.07 12.86 9.86 12.87C9.5 12.86 9.2 12.79 8.97 12.64C8.72 12.48 8.52 12.27 8.38 12.02C8.24 11.77 8.13 11.47 8.08 11.14C8.03 10.81 8 10.47 8 10.14V9.87C8 9.52 8.03 9.19 8.08 8.86V8.86ZM10 0C4.48 0 0 4.48 0 10C0 15.52 4.48 20 10 20C15.52 20 20 15.52 20 10C20 4.48 15.52 0 10 0ZM10 18C5.59 18 2 14.41 2 10C2 5.59 5.59 2 10 2C14.41 2 18 5.59 18 10C18 14.41 14.41 18 10 18Z" fill="white"/>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 600 600"
enable-background="new 0 0 600 600"
xml:space="preserve"
sodipodi:docname="download.svg"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
id="metadata17"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs15">
</defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="999"
id="namedview13"
showgrid="false"
inkscape:zoom="0.78666667"
inkscape:cx="257.94125"
inkscape:cy="387.47074"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<rect
display="none"
fill="#020202"
stroke="#000000"
stroke-width="1.1344"
stroke-miterlimit="10"
width="600"
height="600"
id="rect2" />
<polygon
display="none"
fill="#FFFFFF"
points="0,0 0,600 600,300 "
id="polygon4" />
<path
d="M 449.2,197.8 H 349.4 V 44.5 c 0,-14 -11.2,-25.5 -25,-25.5 h -49.9 c -13.7,0 -25,11.5 -25,25.5 v 153.3 h -99.8 l 149.7,204.4 z m 112.4,76.7 c -20.7,0 -37.4,17.2 -37.4,38.3 V 504.4 H 74.9 V 312.8 C 74.9,291.6 58.1,274.5 37.5,274.5 16.8,274.5 0,291.6 0,312.8 V 542.7 C 0,563.8 16.8,581 37.4,581 h 524.1 c 20.7,0 37.4,-17.2 37.4,-38.3 V 312.8 c 0.1,-21.2 -16.7,-38.3 -37.3,-38.3 z"
id="path6"
style="fill:#000000;fill-opacity:1"
inkscape:connector-curvature="0" />
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

10
assets/svg/license_info.json
View file

@ -216,6 +216,16 @@
"license": "CC0; trivial",
"sources": []
},
{
"authors": [
"Engr.eponce"
],
"path": "download.svg",
"license": "CC-BY-SA 4.0",
"sources": [
"https://commons.wikimedia.org/wiki/File:Download-icon.svg"
]
},
{
"authors": [],
"path": "down.svg",

18
assets/themes/cycle_infra/cycle_infra.json
View file

@ -25,7 +25,7 @@
"startZoom": 11,
"widenFactor": 0.05,
"socialImage": "./assets/themes/cycle_infra/cycle-infra.svg",
"enableExportButton": true,
"enableDownload": true,
"layers": [
{
"id": "cycleways",
@ -69,7 +69,7 @@
},
"then": {
"nl": "Fietsweg",
"en": "Cycleway"
"en": "Bike road"
}
},
{
@ -89,7 +89,7 @@
{
"if": "cycleway=track",
"then": {
"en": "Cycleway next to the road",
"en": "Bike road next to the road",
"nl": "Fietsweg naast de weg"
}
},
@ -219,7 +219,7 @@
"if": "cyclestreet=yes",
"then": {
"en": "This is a cyclestreet, and a 30km/h zone.",
"nl": "Dit is een fietsstraat, en dus een 30km/h zone"
"nl": "Dit is een fietstraat, en dus een 30km/h zone"
},
"addExtraTags": [
"overtaking:motor_vehicle=no",
@ -231,7 +231,7 @@
"if": "cyclestreet=yes",
"then": {
"en": "This is a cyclestreet",
"nl": "Dit is een fietsstraat"
"nl": "Dit is een fietstraat"
},
"hideInAnswer": "_country=be"
},
@ -239,7 +239,7 @@
"if": "cyclestreet=",
"then": {
"en": "This is not a cyclestreet.",
"nl": "Dit is niet een fietsstraat"
"nl": "Dit is niet een fietstraat"
},
"addExtraTags": [
"overtaking:motor_vehicle="
@ -1266,7 +1266,7 @@
"if": "cyclestreet=yes",
"then": {
"en": "This is a cyclestreet, and a 30km/h zone.",
"nl": "Dit is een fietsstraat, en dus een 30km/h zone"
"nl": "Dit is een fietstraat, en dus een 30km/h zone"
},
"addExtraTags": [
"overtaking:motor_vehicle=no",
@ -1278,7 +1278,7 @@
"if": "cyclestreet=yes",
"then": {
"en": "This is a cyclestreet",
"nl": "Dit is een fietsstraat"
"nl": "Dit is een fietstraat"
},
"hideInAnswer": "_country=be"
},
@ -1286,7 +1286,7 @@
"if": "cyclestreet=",
"then": {
"en": "This is not a cyclestreet.",
"nl": "Dit is niet een fietsstraat"
"nl": "Dit is niet een fietstraat"
},
"addExtraTags": [
"overtaking:motor_vehicle="

2
assets/themes/natuurpunt/natuurpunt.json
View file

@ -26,6 +26,8 @@
"widenFactor": 0.05,
"socialImage": "",
"defaultBackgroundId": "CartoDB.Positron",
"enablePdfDownload": true,
"enableDownload": true,
"layers": [
{
"#": "Nature reserve with geometry, z>=13",