midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More tweaks

Browse source
This commit is contained in:
pietervdvn 2022-09-15 14:17:39 +02:00
parent 739275f8a1
commit de4e394088
5 changed files with 69 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Utils/pngMapCreator.ts
View file

@ -71,6 +71,9 @@ export class PngMapCreator {
} else {
const bounds = BBox.fromLeafletBounds(leaflet.getBounds().pad(0.1).pad(-state.layoutToUse.widenFactor))
state.currentBounds.setData(bounds)
if(!state.featurePipeline.sufficientlyZoomed.data){
console.warn("Not sufficiently zoomed!")
}
if (state.featurePipeline.runningQuery.data) {
// A query is running!
@ -81,10 +84,6 @@ export class PngMapCreator {
}
state.featurePipeline.GetTilesPerLayerWithin(bounds, (tile) => {
if (tile.layer.layerDef.minzoom > state.locationControl.data.zoom) {
return
}
if (tile.layer.layerDef.id.startsWith("note_import")) {
// Don't export notes to import
return

3
Utils/svgToPdf.ts
View file

@ -591,6 +591,7 @@ export class SvgToPdf {
if (key === "force") {
console.log("Forcing minzoom of layer",layer.id)
layer.minzoom = 0
layer.minzoomVisible = 0
}
}
}
@ -618,11 +619,13 @@ export class SvgToPdf {
const key = params[paramsKey].toLowerCase().trim()
const isDisplayed = key === "true" || key === "force";
const layer = state.filteredLayers.data.find(l => l.layerDef.id === layerName)
console.log("Setting ", layer?.layerDef?.id," to visibility", isDisplayed, "(minzoom:", layer?.layerDef?.minzoomVisible, layer?.layerDef?.minzoom,")")
layer.isDisplayed.setData(
isDisplayed
)
if (key === "force") {
layer.layerDef.minzoom = 0
layer.layerDef.minzoomVisible = 0
}
}
}

87
assets/templates/MapComplete-flyer.back.svg
View file

@ -27,7 +27,7 @@
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="1.0169528"
inkscape:cx="730.12238"
inkscape:cx="389.89027"
inkscape:cy="403.16522"
inkscape:window-width="1920"
inkscape:window-height="1007"
@ -423,9 +423,9 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect21432-8);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264848;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><tspan
x="28.759766"
y="697.7954"
id="tspan16849"><tspan
id="tspan1852"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16847">$map(theme:aed,z:14,lat:51.2098,lon:3.2284)</tspan></tspan></text>
id="tspan1850">$map(theme:aed,z:14,lat:51.2098,lon:3.2284)</tspan></tspan></text>
<text
xml:space="preserve"
transform="matrix(0.26458333,0,0,0.26458333,1.3325782,-88.396258)"
@ -433,9 +433,9 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect13433);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="28.759766"
y="697.7954"
id="tspan16853"><tspan
id="tspan1856"><tspan
style="font-size:16px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16851">$flyer.toerisme_vlaanderen</tspan></tspan></text>
id="tspan1854">$flyer.toerisme_vlaanderen</tspan></tspan></text>
<rect
style="fill:#deadff;fill-opacity:1;stroke:#000000;stroke-width:0.0270132;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect11121"
@ -450,26 +450,19 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect17153);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="28.759766"
y="697.7954"
id="tspan16857"><tspan
id="tspan1860"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16855">$map(theme:toerisme_vlaanderen,layer-</tspan></tspan><tspan
id="tspan1858">$map(theme:toerisme_vlaanderen,layers:none</tspan></tspan><tspan
x="28.759766"
y="747.7954"
id="tspan16861"><tspan
id="tspan1864"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16859">bench:false,layers:none, layer-</tspan></tspan><tspan
id="tspan1862">,layer-charging_station_ebikes:force,lat:</tspan></tspan><tspan
x="28.759766"
y="797.7954"
id="tspan16865"><tspan
id="tspan1868"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16863">charging_station_ebikes:force,lat:51.02403,lon:</tspan></tspan><tspan
x="28.759766"
y="847.7954"
id="tspan16871"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16867">5</tspan><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16869">.1, z:10)</tspan></tspan></text>
id="tspan1866">51.02403,lon:5.1, z:10)</tspan></tspan></text>
<rect
style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.0178908;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect11459"
@ -484,31 +477,31 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect21432);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="28.759766"
y="697.7954"
id="tspan16877"><tspan
id="tspan1874"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16873">$map(theme:cyclofix,z:14,lat:</tspan><tspan
id="tspan1870">$map(theme:cyclofix,z:14,lat:</tspan><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16875">51.05016,lon:</tspan></tspan><tspan
id="tspan1872">51.05016,lon:</tspan></tspan><tspan
x="28.759766"
y="747.7954"
id="tspan16881"><tspan
id="tspan1878"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16879">3.717842,layers:none,layer-</tspan></tspan><tspan
id="tspan1876">3.717842,layers:none,layer-</tspan></tspan><tspan
x="28.759766"
y="797.7954"
id="tspan16885"><tspan
id="tspan1882"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16883">bike_repair_station:true,layer-</tspan></tspan><tspan
id="tspan1880">bike_repair_station:true,layer-</tspan></tspan><tspan
x="28.759766"
y="847.7954"
id="tspan16889"><tspan
id="tspan1886"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16887">drinking_water:true,layer-bike_cafe:true,layer-</tspan></tspan><tspan
id="tspan1884">drinking_water:true,layer-bike_cafe:true,layer-</tspan></tspan><tspan
x="28.759766"
y="897.7954"
id="tspan16893"><tspan
id="tspan1890"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16891">bicycle_tube_vending_machine: true)</tspan></tspan></text>
id="tspan1888">bicycle_tube_vending_machine: true)</tspan></tspan></text>
<rect
style="fill:#733034;fill-opacity:1;stroke:#000000;stroke-width:0.0661458;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect11543"
@ -530,14 +523,14 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;white-space:pre;shape-inside:url(#rect20457);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264848;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><tspan
x="28.759766"
y="697.7954"
id="tspan16897"><tspan
id="tspan1894"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16895">$map(theme:artwork,z:15,lat:51.2098,lon:</tspan></tspan><tspan
id="tspan1892">$map(theme:artwork,z:15,lat:51.2098,lon:</tspan></tspan><tspan
x="28.759766"
y="747.7954"
id="tspan16901"><tspan
id="tspan1898"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16899">3.2284,background:AGIV)</tspan></tspan></text>
id="tspan1896">3.2284,background:AGIV)</tspan></tspan></text>
<rect
style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.0700743;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect11647"
@ -552,14 +545,14 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect3239);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264848;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><tspan
x="28.759766"
y="697.7954"
id="tspan16905"><tspan
id="tspan1902"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16903">$map(theme:cyclestreets,z:12,lat:51.2098,lon:</tspan></tspan><tspan
id="tspan1900">$map(theme:cyclestreets,z:12,lat:51.2098,lon:</tspan></tspan><tspan
x="28.759766"
y="747.7954"
id="tspan16909"><tspan
id="tspan1906"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16907">3.2284)</tspan></tspan></text>
id="tspan1904">3.2284)</tspan></tspan></text>
<g
id="g1367"
transform="matrix(1,0,0.20502864,-1,-20.554711,213.09746)">
@ -592,14 +585,14 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect890);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264848;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><tspan
x="28.759766"
y="697.7954"
id="tspan16913"><tspan
id="tspan1910"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16911">$map(theme:benches,z:14,lat:51.2098,lon:</tspan></tspan><tspan
id="tspan1908">$map(theme:benches,z:14,lat:51.2098,lon:</tspan></tspan><tspan
x="28.759766"
y="747.7954"
id="tspan16917"><tspan
id="tspan1914"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16915">3.2284, layers:none, layer-bench:force)</tspan></tspan></text>
id="tspan1912">3.2284, layers:none, layer-bench:force)</tspan></tspan></text>
<text
xml:space="preserve"
transform="matrix(0.26458333,0,0,0.26458333,205.99418,0.58092297)"
@ -607,9 +600,9 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect6468);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="28.759766"
y="697.7954"
id="tspan16921"><tspan
id="tspan1918"><tspan
style="font-size:16px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16919">$flyer.aerial</tspan></tspan></text>
id="tspan1916">$flyer.aerial</tspan></tspan></text>
<text
xml:space="preserve"
transform="matrix(0.26458333,0,0,0.26458333,-1.7998979,-153.42245)"
@ -617,9 +610,9 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect3512);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="28.759766"
y="697.7954"
id="tspan16925"><tspan
id="tspan1922"><tspan
style="font-size:18.6667px;-inkscape-font-specification:'sans-serif, Normal'"
id="tspan16923">$flyer.examples</tspan></tspan></text>
id="tspan1920">$flyer.examples</tspan></tspan></text>
<g
id="path15616"
transform="matrix(-1,0,0,1,497.66957,-0.86523396)">
@ -686,9 +679,9 @@
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect135032);fill:#000000;fill-opacity:1;stroke:none"><tspan
x="8.7285156"
y="42.098132"
id="tspan16929"><tspan
id="tspan1926"><tspan
style="font-weight:bold;font-size:34.6667px;-inkscape-font-specification:'sans-serif, Bold'"
id="tspan16927">$flyer.title</tspan></tspan></text>
id="tspan1924">$flyer.title</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

64
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -1,16 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete",
"de": "Mit MapComplete vorgenommene Änderungen"
"en": "Changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete",
"de": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden"
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This map shows all the changes made with MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
"en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
@ -23,9 +20,7 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers",
"de": "Zentrum der Änderungssätze",
"nl": "Zwaartepunten van wijzigingensets"
"en": "Changeset centers"
},
"minzoom": 0,
"source": {
@ -36,48 +31,41 @@
},
"title": {
"render": {
"en": "Changeset for {theme}",
"de": "Änderungssatz für {theme}"
"en": "Changeset for {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes",
"de": "Zeigt alle MapComplete-Änderungen"
"en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "show_changeset_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"question": {
"en": "What contributor did make this change?",
"de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
"en": "What contributor did make this change?"
},
"freeform": {
"key": "user"
},
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
}
},
{
"id": "theme-id",
"question": {
"en": "What theme was used to make this change?",
"de": "Welches Thema wurde für diese Änderung verwendet?"
"en": "What theme was used to make this change?"
},
"freeform": {
"key": "theme"
},
"render": {
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
}
},
{
@ -86,23 +74,19 @@
"key": "locale"
},
"question": {
"en": "What locale (language) was this change made in?",
"de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?"
"en": "What locale (language) was this change made in?"
},
"render": {
"en": "User locale is {locale}",
"de": "Benutzergebietsschema ist {locale}"
"en": "User locale is {locale}"
}
},
{
"id": "host",
"render": {
"en": "Changed with <a href='{host}'>{host}</a>",
"de": "Geändert über <a href='{host}'>{host}</a>"
"en": "Change with with <a href='{host}'>{host}</a>"
},
"question": {
"en": "What host (website) was this change made with?",
"de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
"en": "What host (website) was this change made with?"
},
"freeform": {
"key": "host"
@ -423,8 +407,7 @@
}
],
"question": {
"en": "Themename contains {search}",
"de": "Themename enthält {search}"
"en": "Themename contains {search}"
}
}
]
@ -440,8 +423,7 @@
}
],
"question": {
"en": "Made by contributor {search}",
"de": "Erstellt vom Mitwirkenden {search}"
"en": "Made by contributor {search}"
}
}
]
@ -457,8 +439,7 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}",
"de": "<b>Nicht</b> von Mitwirkendem {search}"
"en": "<b>Not</b> made by contributor {search}"
}
}
]
@ -475,8 +456,7 @@
}
],
"question": {
"en": "User language (iso-code) {search}",
"de": "Benutzersprache (ISO-Code) {search}"
"en": "Made before {search}"
}
}
]
@ -493,8 +473,7 @@
}
],
"question": {
"en": "Made with host {search}",
"de": "Erstellt mit host {search}"
"en": "Made after {search}"
}
}
]
@ -541,8 +520,7 @@
{
"id": "link_to_more",
"render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
"de": "Weitere Statistiken finden Sie unter <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
}
},
{

2
test.ts
View file

@ -26,6 +26,8 @@ async function main() {
// Dirty hack!
// Make the charging-station layer simpler to allow querying it by overpass
const chargingStationLayer: LayerConfig = AllKnownLayouts.allKnownLayouts.get("toerisme_vlaanderen").layers.find(l => l.id === "charging_station_ebikes")
chargingStationLayer.minzoom = 0
chargingStationLayer.minzoomVisible = 0
// chargingStationLayer.source.osmTags = new And([new Tag("amenity","charging_station"), new Tag("bicycle","yes")])
Constants.defaultOverpassUrls.splice(0,1) // remove overpass-api.de for this run
}