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

Tweaking GRB theme a bit more

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-06-01 03:17:52 +02:00
parent ace7caada1
commit fbf2742f80
3 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Logic/FeatureSource/TiledFeatureSource/LocalStorageFeatureSource.ts
View file

@ -4,8 +4,6 @@ import {BBox} from "../../BBox"
import TileLocalStorage from "../Actors/TileLocalStorage" import TileLocalStorage from "../Actors/TileLocalStorage"
import {Feature} from "geojson" import {Feature} from "geojson"
import StaticFeatureSource from "../Sources/StaticFeatureSource" import StaticFeatureSource from "../Sources/StaticFeatureSource"
import {constants} from "http2";
import HTTP_STATUS_CONTINUE = module
export default class LocalStorageFeatureSource extends DynamicTileSource { export default class LocalStorageFeatureSource extends DynamicTileSource {
constructor( constructor(

2
UI/ThemeViewGUI.svelte
View file

@ -150,7 +150,7 @@
</MapControlButton> </MapControlButton>
<a class="pointer-events-auto opacity-50 hover:opacity-100 text-white cursor-pointer bg-black-transparent pl-1 pr-2 rounded-2xl h-fit max-h-12 overflow-hidden self-end" <a class="pointer-events-auto opacity-50 hover:opacity-100 text-white cursor-pointer bg-black-transparent pl-1 pr-2 rounded-2xl h-fit max-h-12 overflow-hidden self-end"
on:click={() =>{ state.guistate.themeViewTab.setData("copyright"); state.guistate.themeIsOpened.setData(true)}}> on:click={() =>{ state.guistate.themeViewTab.setData("copyright"); state.guistate.themeIsOpened.setData(true)}}>
© OpenStreetMap <span class="w-24">{rasterLayerName}</span> © OpenStreetMap, <span class="w-24">{rasterLayerName}</span>
</a> </a>
</div> </div>

24
assets/themes/grb/grb.json
View file

@ -26,7 +26,7 @@
"maxZoom": 15 "maxZoom": 15
}, },
"overrideAll": { "overrideAll": {
"minzoom": 17 "minzoom": 15
}, },
"layers": [ "layers": [
{ {
@ -380,7 +380,6 @@
"id": "Building info", "id": "Building info",
"render": "This is a <b>{building}</b> <span class='subtle'>detected by {detection_method}</span>" "render": "This is a <b>{building}</b> <span class='subtle'>detected by {detection_method}</span>"
}, },
{ {
"id": "overlapping building address", "id": "overlapping building address",
"render": "The overlapping openstreetmap-building has no address information at all", "render": "The overlapping openstreetmap-building has no address information at all",
@ -724,7 +723,7 @@
"builtin": "current_view", "builtin": "current_view",
"override": { "override": {
"calculatedTags+": [ "calculatedTags+": [
"_overlapping=Number(feat.properties.zoom) >= 16 ? overlapWith(feat)('grb').map(ff => ff.feat.properties) : undefined", "_overlapping=Number(feat.properties.zoom) >= 14 ? overlapWith(feat)('grb').map(ff => ff.feat.properties) : undefined",
"_applicable_conflate=get(feat)('_overlapping')?.filter(p => p._imported !== 'yes' && (!p['_imported_osm_still_fresh'] || !p['_imported_osm_object_found']) && p['_overlap_absolute'] > 10 && p['_overlap_percentage'] > 80 && p['_reverse_overlap_percentage'] > 80)?.map(p => p.id)", "_applicable_conflate=get(feat)('_overlapping')?.filter(p => p._imported !== 'yes' && (!p['_imported_osm_still_fresh'] || !p['_imported_osm_object_found']) && p['_overlap_absolute'] > 10 && p['_overlap_percentage'] > 80 && p['_reverse_overlap_percentage'] > 80)?.map(p => p.id)",
"_applicable=feat.properties._overlapping.filter(p => p._imported !== 'yes' && p._imported_osm_object_found === false && !(p['_overlap_absolute'] > 5) && !p._intersects_with_other_features)?.map(p => p.id)", "_applicable=feat.properties._overlapping.filter(p => p._imported !== 'yes' && p._imported_osm_object_found === false && !(p['_overlap_absolute'] > 5) && !p._intersects_with_other_features)?.map(p => p.id)",
"_applicable_count=get(feat)('_applicable')?.length", "_applicable_count=get(feat)('_applicable')?.length",
@ -751,23 +750,11 @@
}, },
{ {
"id": "autoapply", "id": "autoapply",
"render": "{auto_apply(grb, _applicable, Import-button, Import all non-conflicting buildings in view)}", "render": "{auto_apply(grb, _applicable, Import-button, Import all non-conflicting buildings in view)}"
"mappings": [
{
"if": "zoom<16",
"then": "Zoom in more to import"
}
]
}, },
{ {
"id": "autoapply_conflate", "id": "autoapply_conflate",
"render": "{auto_apply(grb, _applicable_conflate, Import-button, Conflate all non-conflicting buildings in view)}", "render": "{auto_apply(grb, _applicable_conflate, Import-button, Conflate all non-conflicting buildings in view)}"
"mappings": [
{
"if": "zoom<16",
"then": "Zoom in more to import"
}
]
} }
], ],
"+mapRendering": [ "+mapRendering": [
@ -780,14 +767,13 @@
}, },
"iconSize": "15,15,center" "iconSize": "15,15,center"
} }
] ]
} }
} }
], ],
"hideFromOverview": true, "hideFromOverview": true,
"defaultBackgroundId": "AGIVFlandersGRB", "defaultBackgroundId": "AGIVFlandersGRB",
"overpassMaxZoom": 17, "overpassMaxZoom": 15,
"osmApiTileSize": 17, "osmApiTileSize": 17,
"credits": "Pieter Vander Vennet" "credits": "Pieter Vander Vennet"
} }