diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index 8d8973b7b7..08083a10f4 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -26,12 +26,16 @@ The following values are always calculated, by default, by MapComplete and are a
The latitude and longitude of the point (or centerpoint in the case of a way/area)
+
+
### _surface, _surface:ha
The surface area of the feature, in square meters and in hectare. Not set on points and ways
+This is a lazy metatag and is only calculated when needed
+
### _length, _length:km
@@ -40,6 +44,8 @@ The surface area of the feature, in square meters and in hectare. Not set on poi
The total length of a feature in meters (and in kilometers, rounded to one decimal for '_length:km'). For a surface, the length of the perimeter
+
+
### Theme-defined keys
@@ -47,6 +53,8 @@ The total length of a feature in meters (and in kilometers, rounded to one decim
If 'units' is defined in the layoutConfig, then this metatagger will rewrite the specified keys to have the canonical form (e.g. `1meter` will be rewritten to `1m`)
+
+
### _country
@@ -54,18 +62,15 @@ If 'units' is defined in the layoutConfig, then this metatagger will rewrite the
The country code of the property (with latlon2country)
+
+
### _isOpen, _isOpen:description
If 'opening_hours' is present, it will add the current state of the feature (being 'yes' or 'no')
-
-### _width:needed, _width:needed:no_pedestrians, _width:difference
-
-
-
-Legacy for a specific project calculating the needed width for safe traffic on a road. Only activated if 'width:carriageway' is present
+This is a lazy metatag and is only calculated when needed
### _direction:numerical, _direction:leftright
@@ -75,6 +80,8 @@ Legacy for a specific project calculating the needed width for safe traffic on a
_direction:numerical is a normalized, numerical direction based on 'camera:direction' or on 'direction'; it is only present if a valid direction is found (e.g. 38.5 or NE). _direction:leftright is either 'left' or 'right', which is left-looking on the map or 'right-looking' on the map
+
+
### _now:date, _now:datetime, _loaded:date, _loaded:_datetime
@@ -82,6 +89,8 @@ _direction:numerical is a normalized, numerical direction based on 'camera:direc
Adds the time that the data got loaded - pretty much the time of downloading from overpass. The format is YYYY-MM-DD hh:mm, aka 'sortable' aka ISO-8601-but-not-entirely
+
+
### _last_edit:contributor, _last_edit:contributor:uid, _last_edit:changeset, _last_edit:timestamp, _version_number
@@ -89,6 +98,8 @@ Adds the time that the data got loaded - pretty much the time of downloading fro
Information about the last edit of this object.
+
+
Calculating tags with Javascript
----------------------------------
@@ -140,15 +151,15 @@ Some advanced functions are available on **feat** as well:
- distanceTo
- overlapWith
- closest
+ - closestn
- memberships
- - score
### distanceTo
Calculates the distance between the feature and a specified point in kilometer. The input should either be a pair of coordinates, a geojson feature or the ID of an object
- 0. longitude
- 1. latitude
+ 0. feature OR featureID OR longitude
+ 1. undefined OR latitude
### overlapWith
@@ -160,10 +171,21 @@ For example to get all objects which overlap or embed from a layer, use `_contai
### closest
- Given either a list of geojson features or a single layer name, gives the single object which is nearest to the feature. In the case of ways/polygons, only the centerpoint is considered.
+ Given either a list of geojson features or a single layer name, gives the single object which is nearest to the feature. In the case of ways/polygons, only the centerpoint is considered. Returns a single geojson feature or undefined if nothing is found (or not yet laoded)
0. list of features
+### closestn
+
+ Given either a list of geojson features or a single layer name, gives the n closest objects which are nearest to the feature (excluding the feature itself). In the case of ways/polygons, only the centerpoint is considered. Returns a list of `{feat: geojson, distance:number}` the empty list if nothing is found (or not yet loaded)
+
+If a 'unique tag key' is given, the tag with this key will only appear once (e.g. if 'name' is given, all features will have a different name)
+
+ 0. list of features or layer name
+ 1. amount of features
+ 2. unique tag key (optional)
+ 3. maxDistanceInMeters (optional)
+
### memberships
Gives a list of `{role: string, relation: Relation}`-objects, containing all the relations that this feature is part of.
@@ -171,12 +193,4 @@ For example to get all objects which overlap or embed from a layer, use `_contai
For example: `_part_of_walking_routes=feat.memberships().map(r => r.relation.tags.name).join(';')`
-
-### score
-
- Given the path of an aspected routing json file, will calculate the score. This score is wrapped in a UIEventSource, so for further calculations, use `.map(score => ...)`
-
-For example: `_comfort_score=feat.score('https://raw.githubusercontent.com/pietervdvn/AspectedRouting/master/Examples/bicycle/aspects/bicycle.comfort.json')`
-
- 0. path
Generated from SimpleMetaTagger, ExtraFunction
\ No newline at end of file
diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md
index da4a4bc204..f5ca4d6e81 100644
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@@ -5,11 +5,6 @@
### all_tags
Prints all key-value pairs of the object - used for debugging
-
-name | default | description
------- | --------- | -------------
-
-
#### Example usage
`{all_tags()}`
@@ -20,11 +15,10 @@ name | default | description
name | default | description
------ | --------- | -------------
image key/prefix | image | The keys given to the images, e.g. if image is given, the first picture URL will be added as image, the second as image:0, the third as image:1, etc...
-smart search | true | Also include images given via 'Wikidata', 'wikimedia_commons' and 'mapillary
#### Example usage
- `{image_carousel(image,true)}`
+ `{image_carousel(image)}`
### image_upload
Creates a button where a user can upload an image to IMGUR
@@ -36,6 +30,17 @@ image-key | image | Image tag to add the URL to (or image-tag:0, image-tag:1 whe
#### Example usage
`{image_upload(image)}`
+### wikipedia
+
+ A box showing the corresponding wikipedia article - based on the wikidata tag
+
+name | default | description
+------ | --------- | -------------
+keyToShowWikipediaFor | wikidata | Use the wikidata entry from this key to show the wikipedia article for
+
+#### Example usage
+
+ `{wikipedia()}` is a basic example, `{wikipedia(name:etymology:wikidata)}` to show the wikipedia page of whom the feature was named after. Also remember that these can be styled, e.g. `{wikipedia():max-height: 10rem}` to limit the height
### minimap
A small map showing the selected feature. Note that no styling is applied, wrap this in a div
@@ -128,16 +133,25 @@ If you want to import a dataset, make sure that:
1. The dataset to import has a suitable license
2. The community has been informed of the import
-3. The theme will filter out duplicate nodes4. All other requirements of the [import guidelines](https://wiki.openstreetmap.org/wiki/Import/Guidelines) have been followed
+3. All other requirements of the [import guidelines](https://wiki.openstreetmap.org/wiki/Import/Guidelines) have been followed
+
+There are also some technicalities in your theme to keep in mind:
+
+1. The new point will be added and will flow through the program as any other new point as if it came from OSM.
+ This means that there should be a layer which will match the new tags and which will display it.
+2. The original point from your geojson layer will gain the tag '_imported=yes'.
+ This should be used to change the appearance or even to hide it (eg by changing the icon size to zero)
+3. There should be a way for the theme to detect previously imported points, even after reloading.
+ A reference number to the original dataset is an excellen way to do this
+
name | default | description
------ | --------- | -------------
-tags | undefined | Tags to copy-specification. This contains one or more pairs (seperated by a `;`), e.g. `amenity=fast_food; addr:housenumber={number}`. This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. (Hint: prepare these values, e.g. with calculatedTags)
+tags | undefined | Tags to copy-specification. This contains one or more pairs (seperated by a `;`), e.g. `amenity=fast_food; addr:housenumber=$number`. This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. (Hint: prepare these values, e.g. with calculatedTags)
text | Import this data into OpenStreetMap | The text to show on the button
icon | ./assets/svg/addSmall.svg | A nice icon to show in the button
+minzoom | 18 | How far the contributor must zoom in before being able to import the point
#### Example usage
- `{import_button(,Import this data into OpenStreetMap,./assets/svg/addSmall.svg)}`
-
-Generated from UI/SpecialVisualisations.ts
\ No newline at end of file
+ `{import_button(,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,18)}` Generated from UI/SpecialVisualisations.ts
\ No newline at end of file
diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md
index f353809015..bd363df9b7 100644
--- a/Docs/URL_Parameters.md
+++ b/Docs/URL_Parameters.md
@@ -161,7 +161,7 @@ Finally, the URL-hash is the part after the `#`. It is `node/1234` in this case.
overpassUrl
-------------
- Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter The default value is _https://overpass-api.de/api/interpreter_
+ Point mapcomplete to a different overpass-instance. Example: https://overpass-api.de/api/interpreter The default value is _https://overpass-api.de/api/interpreter,https://overpass.kumi.systems/api/interpreter,https://overpass.openstreetmap.ru/cgi/interpreter_
overpassTimeout
diff --git a/InitUiElements.ts b/InitUiElements.ts
index 8fafd7677d..59f56b849f 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -423,13 +423,13 @@ export class InitUiElements {
flayers.push(flayer);
}
state.filteredLayers = new UIEventSource(flayers);
-
-
+
+ const clustering = State.state.layoutToUse.clustering
const clusterCounter = TileHierarchyAggregator.createHierarchy()
new ShowDataLayer({
- features: clusterCounter.getCountsForZoom(State.state.locationControl, State.state.layoutToUse.clustering.minNeededElements),
+ features: clusterCounter.getCountsForZoom(clustering, State.state.locationControl, State.state.layoutToUse.clustering.minNeededElements),
leafletMap: State.state.leafletMap,
layerToShow: ShowTileInfo.styling,
enablePopups: false
@@ -440,7 +440,7 @@ export class InitUiElements {
clusterCounter.addTile(source)
- const clustering = State.state.layoutToUse.clustering
+ // Do show features indicates if the 'showDataLayer' should be shown
const doShowFeatures = source.features.map(
f => {
const z = State.state.locationControl.data.zoom
@@ -449,12 +449,24 @@ export class InitUiElements {
return false;
}
+ const bounds = State.state.currentBounds.data
+ if(bounds === undefined){
+ // Map is not yet displayed
+ return false;
+ }
+
+ if (!source.bbox.overlapsWith(bounds)) {
+ // Not within range -> features are hidden
+ return false
+ }
+
+
if (z < source.layer.layerDef.minzoom) {
// Layer is always hidden for this zoom level
return false;
}
- if (z >= clustering.maxZoom) {
+ if (z > clustering.maxZoom) {
return true
}
@@ -473,23 +485,15 @@ export class InitUiElements {
}
if (clusterCounter.getTile(Tiles.tile_index(tileZ, tileX, tileY))?.totalValue > clustering.minNeededElements) {
+ // To much elements
return false
}
}
- const bounds = State.state.currentBounds.data
- if(bounds === undefined){
- // Map is not yet displayed
- return false;
- }
- if (!source.bbox.overlapsWith(bounds)) {
- // Not within range
- return false
- }
-
+
return true
- }, [State.state.currentBounds]
+ }, [State.state.currentBounds, source.layer.isDisplayed]
)
new ShowDataLayer(
diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts
index 4f4f7a77f8..62cf799988 100644
--- a/Logic/Actors/OverpassFeatureSource.ts
+++ b/Logic/Actors/OverpassFeatureSource.ts
@@ -38,8 +38,7 @@ export default class OverpassFeatureSource implements FeatureSource {
readonly currentBounds: UIEventSource
}
private readonly _isActive: UIEventSource;
- private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[]) => void;
-
+ private readonly onBboxLoaded: (bbox: BBox, date: Date, layers: LayerConfig[], zoomlevel: number) => void;
constructor(
state: {
readonly locationControl: UIEventSource,
@@ -49,10 +48,11 @@ export default class OverpassFeatureSource implements FeatureSource {
readonly overpassMaxZoom: UIEventSource,
readonly currentBounds: UIEventSource
},
- options?: {
+ options: {
+ padToTiles: UIEventSource,
isActive?: UIEventSource,
relationTracker: RelationsTracker,
- onBboxLoaded?: (bbox: BBox, date: Date, layers: LayerConfig[]) => void
+ onBboxLoaded?: (bbox: BBox, date: Date, layers: LayerConfig[], zoomlevel: number) => void
}) {
this.state = state
@@ -61,7 +61,7 @@ export default class OverpassFeatureSource implements FeatureSource {
this.relationsTracker = options.relationTracker
const self = this;
state.currentBounds.addCallback(_ => {
- self.update()
+ self.update(options.padToTiles.data)
})
}
@@ -84,21 +84,21 @@ export default class OverpassFeatureSource implements FeatureSource {
return new Overpass(new Or(filters), extraScripts, interpreterUrl, this.state.overpassTimeout, this.relationsTracker);
}
- private update() {
+ private update(paddedZoomLevel: number) {
if (!this._isActive.data) {
return;
}
const self = this;
- this.updateAsync().then(bboxDate => {
+ this.updateAsync(paddedZoomLevel).then(bboxDate => {
if(bboxDate === undefined || self.onBboxLoaded === undefined){
return;
}
const [bbox, date, layers] = bboxDate
- self.onBboxLoaded(bbox, date, layers)
+ self.onBboxLoaded(bbox, date, layers, paddedZoomLevel)
})
}
- private async updateAsync(): Promise<[BBox, Date, LayerConfig[]]> {
+ private async updateAsync(padToZoomLevel: number): Promise<[BBox, Date, LayerConfig[]]> {
if (this.runningQuery.data) {
console.log("Still running a query, not updating");
return undefined;
@@ -109,7 +109,7 @@ export default class OverpassFeatureSource implements FeatureSource {
return undefined;
}
- const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(14);
+ const bounds = this.state.currentBounds.data?.pad(this.state.layoutToUse.widenFactor)?.expandToTileBounds(padToZoomLevel);
if (bounds === undefined) {
return undefined;
diff --git a/Logic/BBox.ts b/Logic/BBox.ts
index a6f350cf83..0205b15337 100644
--- a/Logic/BBox.ts
+++ b/Logic/BBox.ts
@@ -116,16 +116,15 @@ export class BBox {
return this.minLat
}
- pad(factor: number): BBox {
- const latDiff = this.maxLat - this.minLat
- const lat = (this.maxLat + this.minLat) / 2
- const lonDiff = this.maxLon - this.minLon
- const lon = (this.maxLon + this.minLon) / 2
+ pad(factor: number, maxIncrease = 2): BBox {
+
+ const latDiff = Math.min(maxIncrease / 2, Math.abs(this.maxLat - this.minLat) * factor)
+ const lonDiff =Math.min(maxIncrease / 2, Math.abs(this.maxLon - this.minLon) * factor)
return new BBox([[
- lon - lonDiff * factor,
- lat - latDiff * factor
- ], [lon + lonDiff * factor,
- lat + latDiff * factor]])
+ this.minLon - lonDiff,
+ this.minLat - latDiff
+ ], [this.maxLon + lonDiff,
+ this.maxLat + latDiff]])
}
toLeaflet() {
diff --git a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts
index b0fbc25ded..092c1a4023 100644
--- a/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts
+++ b/Logic/FeatureSource/Actors/SaveTileToLocalStorageActor.ts
@@ -4,11 +4,10 @@
* Technically, more an Actor then a featuresource, but it fits more neatly this ay
*/
import {FeatureSourceForLayer} from "../FeatureSource";
-import SimpleMetaTagger from "../../SimpleMetaTagger";
export default class SaveTileToLocalStorageActor {
public static readonly storageKey: string = "cached-features";
- public static readonly formatVersion: string = "1"
+ public static readonly formatVersion: string = "2"
constructor(source: FeatureSourceForLayer, tileIndex: number) {
@@ -37,6 +36,5 @@ export default class SaveTileToLocalStorageActor {
}catch(e){
console.error("Could not mark tile ", key, "as visited")
}
-
}
}
\ No newline at end of file
diff --git a/Logic/FeatureSource/FeaturePipeline.ts b/Logic/FeatureSource/FeaturePipeline.ts
index 8d8b2e4b19..ee89ee6aa3 100644
--- a/Logic/FeatureSource/FeaturePipeline.ts
+++ b/Logic/FeatureSource/FeaturePipeline.ts
@@ -58,7 +58,7 @@ export default class FeaturePipeline {
private readonly freshnesses = new Map();
private readonly oldestAllowedDate: Date = new Date(new Date().getTime() - 60 * 60 * 24 * 30 * 1000);
- private readonly osmSourceZoomLevel = 14
+ private readonly osmSourceZoomLevel = 15
constructor(
handleFeatureSource: (source: FeatureSourceForLayer & Tiled) => void,
@@ -147,7 +147,7 @@ export default class FeaturePipeline {
// We split them up into tiles anyway as it is an OSM source
TiledFeatureSource.createHierarchy(src, {
layer: src.layer,
- minZoomLevel: 14,
+ minZoomLevel: this.osmSourceZoomLevel,
dontEnforceMinZoom: true,
registerTile: (tile) => {
new RegisteringAllFromFeatureSourceActor(tile)
@@ -155,7 +155,7 @@ export default class FeaturePipeline {
tile.features.addCallbackAndRunD(_ => self.newDataLoadedSignal.setData(tile))
}
})
- }else{
+ } else {
new RegisteringAllFromFeatureSourceActor(src)
perLayerHierarchy.get(id).registerTile(src)
src.features.addCallbackAndRunD(_ => self.newDataLoadedSignal.setData(src))
@@ -200,7 +200,7 @@ export default class FeaturePipeline {
new PerLayerFeatureSourceSplitter(state.filteredLayers,
(source) => TiledFeatureSource.createHierarchy(source, {
layer: source.layer,
- minZoomLevel: 14,
+ minZoomLevel: source.layer.layerDef.minzoom,
dontEnforceMinZoom: true,
maxFeatureCount: state.layoutToUse.clustering.minNeededElements,
maxZoomLevel: state.layoutToUse.clustering.maxZoom,
@@ -235,7 +235,7 @@ export default class FeaturePipeline {
// Whenever fresh data comes in, we need to update the metatagging
- self.newDataLoadedSignal.stabilized(1000).addCallback(src => {
+ self.newDataLoadedSignal.stabilized(1000).addCallback(_ => {
self.updateAllMetaTagging()
})
@@ -276,15 +276,15 @@ export default class FeaturePipeline {
const self = this
return this.state.currentBounds.map(bbox => {
if (bbox === undefined) {
- return
+ return undefined
}
if (!isSufficientlyZoomed.data) {
- return;
+ return undefined;
}
const osmSourceZoomLevel = self.osmSourceZoomLevel
const range = bbox.containingTileRange(osmSourceZoomLevel)
const tileIndexes = []
- if (range.total > 100) {
+ if (range.total >= 100) {
// Too much tiles!
return []
}
@@ -294,7 +294,7 @@ export default class FeaturePipeline {
if (oldestDate !== undefined && oldestDate > this.oldestAllowedDate) {
console.debug("Skipping tile", osmSourceZoomLevel, x, y, "as a decently fresh one is available")
// The cached tiles contain decently fresh data
- return;
+ return undefined;
}
tileIndexes.push(i)
})
@@ -327,28 +327,30 @@ export default class FeaturePipeline {
}
const range = bbox.containingTileRange(zoom)
- if (range.total > 100) {
+ if (range.total >= 5000) {
return false
}
const self = this;
const allFreshnesses = Tiles.MapRange(range, (x, y) => self.freshnessForVisibleLayers(zoom, x, y))
return allFreshnesses.some(freshness => freshness === undefined || freshness < this.oldestAllowedDate)
-
}, [state.locationControl])
const self = this;
const updater = new OverpassFeatureSource(state,
{
+ padToTiles: state.locationControl.map(l => Math.min(15, l.zoom + 1)),
relationTracker: this.relationTracker,
isActive: useOsmApi.map(b => !b && overpassIsActive.data, [overpassIsActive]),
- onBboxLoaded: ((bbox, date, downloadedLayers) => {
- Tiles.MapRange(bbox.containingTileRange(self.osmSourceZoomLevel), (x, y) => {
+ onBboxLoaded: (bbox, date, downloadedLayers, paddedToZoomLevel) => {
+ Tiles.MapRange(bbox.containingTileRange(paddedToZoomLevel), (x, y) => {
+ const tileIndex = Tiles.tile_index(paddedToZoomLevel, x, y)
downloadedLayers.forEach(layer => {
- SaveTileToLocalStorageActor.MarkVisited(layer.id, Tiles.tile_index(this.osmSourceZoomLevel, x, y), date)
+ self.freshnesses.get(layer.id).addTileLoad(tileIndex, date)
+ SaveTileToLocalStorageActor.MarkVisited(layer.id, tileIndex, date)
})
})
- })
+ }
});
diff --git a/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts b/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
index fcfdbea5a4..fc110e1c2c 100644
--- a/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
+++ b/Logic/FeatureSource/TiledFeatureSource/DynamicGeoJsonTileSource.ts
@@ -21,7 +21,9 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
throw "Invalid layer: geojsonSource expected"
}
- const whitelistUrl = source.geojsonSource.replace("{z}_{x}_{y}.geojson", "overview.json")
+ const whitelistUrl = source.geojsonSource
+ .replace("{z}", ""+source.geojsonZoomLevel)
+ .replace("{x}_{y}.geojson", "overview.json")
.replace("{layer}",layer.layerDef.id)
let whitelist = undefined
@@ -46,7 +48,8 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
if(whitelist !== undefined){
const isWhiteListed = whitelist.get(zxy[1])?.has(zxy[2])
if(!isWhiteListed){
- return undefined;
+ console.log("Not whitelisted:",zxy, isWhiteListed, whitelist)
+ // return undefined;
}
}
diff --git a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts
index 6f815f48d5..a2cd50be08 100644
--- a/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts
+++ b/Logic/FeatureSource/TiledFeatureSource/TiledFromLocalStorageSource.ts
@@ -1,14 +1,16 @@
import FilteredLayer from "../../../Models/FilteredLayer";
import {FeatureSourceForLayer, Tiled} from "../FeatureSource";
import {UIEventSource} from "../../UIEventSource";
-import Loc from "../../../Models/Loc";
import TileHierarchy from "./TileHierarchy";
import SaveTileToLocalStorageActor from "../Actors/SaveTileToLocalStorageActor";
import {Tiles} from "../../../Models/TileRange";
import {BBox} from "../../BBox";
export default class TiledFromLocalStorageSource implements TileHierarchy {
- public loadedTiles: Map = new Map();
+ public readonly loadedTiles: Map = new Map();
+ private readonly layer: FilteredLayer;
+ private readonly handleFeatureSource: (src: FeatureSourceForLayer & Tiled, index: number) => void;
+ private readonly undefinedTiles: Set;
public static GetFreshnesses(layerId: string): Map {
const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layerId + "-"
@@ -29,14 +31,15 @@ export default class TiledFromLocalStorageSource implements TileHierarchy void,
state: {
- locationControl: UIEventSource
- leafletMap: any
+ currentBounds: UIEventSource
}) {
+ this.layer = layer;
+ this.handleFeatureSource = handleFeatureSource;
- const undefinedTiles = new Set()
+
+ this.undefinedTiles = new Set()
const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-"
- // @ts-ignore
- const indexes: number[] = Object.keys(localStorage)
+ const knownTiles: number[] = Object.keys(localStorage)
.filter(key => {
return key.startsWith(prefix) && !key.endsWith("-time") && !key.endsWith("-format");
})
@@ -45,8 +48,8 @@ export default class TiledFromLocalStorageSource implements TileHierarchy !isNaN(i))
- console.debug("Layer", layer.layerDef.id, "has following tiles in available in localstorage", indexes.map(i => Tiles.tile_from_index(i).join("/")).join(", "))
- for (const index of indexes) {
+ console.debug("Layer", layer.layerDef.id, "has following tiles in available in localstorage", knownTiles.map(i => Tiles.tile_from_index(i).join("/")).join(", "))
+ for (const index of knownTiles) {
const prefix = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" + index;
const version = localStorage.getItem(prefix + "-format")
@@ -55,78 +58,54 @@ export default class TiledFromLocalStorageSource implements TileHierarchy i % 100)
- const indexesSet = new Set(indexes)
- const maxZoom = Math.max(...zLevels)
- const minZoom = Math.min(...zLevels)
- const self = this;
+ const self = this
+ state.currentBounds.map(bounds => {
- const neededTiles = state.locationControl.map(
- location => {
- if (!layer.isDisplayed.data) {
- // No need to download! - the layer is disabled
- return undefined;
- }
-
- if (location.zoom < layer.layerDef.minzoom) {
- // No need to download! - the layer is disabled
- return undefined;
- }
-
- // Yup, this is cheating to just get the bounds here
- const bounds = state.leafletMap.data?.getBounds()
- if (bounds === undefined) {
- // We'll retry later
- return undefined
- }
-
- const needed = []
- for (let z = minZoom; z <= maxZoom; z++) {
-
- const tileRange = Tiles.TileRangeBetween(z, bounds.getNorth(), bounds.getEast(), bounds.getSouth(), bounds.getWest())
- const neededZ = Tiles.MapRange(tileRange, (x, y) => Tiles.tile_index(z, x, y))
- .filter(i => !self.loadedTiles.has(i) && !undefinedTiles.has(i) && indexesSet.has(i))
- needed.push(...neededZ)
- }
-
- if (needed.length === 0) {
- return undefined
- }
- return needed
+ if(bounds === undefined){
+ return;
}
- , [layer.isDisplayed, state.leafletMap]).stabilized(50);
-
- neededTiles.addCallbackAndRunD(neededIndexes => {
- for (const neededIndex of neededIndexes) {
- // We load the features from localStorage
- try {
- const key = SaveTileToLocalStorageActor.storageKey + "-" + layer.layerDef.id + "-" + neededIndex
- const data = localStorage.getItem(key)
- const features = JSON.parse(data)
- const src = {
- layer: layer,
- features: new UIEventSource<{ feature: any; freshness: Date }[]>(features),
- name: "FromLocalStorage(" + key + ")",
- tileIndex: neededIndex,
- bbox: BBox.fromTileIndex(neededIndex)
- }
- handleFeatureSource(src, neededIndex)
- self.loadedTiles.set(neededIndex, src)
- } catch (e) {
- console.error("Could not load data tile from local storage due to", e)
- undefinedTiles.add(neededIndex)
+ for (const knownTile of knownTiles) {
+
+ if(this.loadedTiles.has(knownTile)){
+ continue;
}
+ if(this.undefinedTiles.has(knownTile)){
+ continue;
+ }
+
+ if(!bounds.overlapsWith(BBox.fromTileIndex(knownTile))){
+ continue;
+ }
+ self.loadTile(knownTile)
}
-
-
})
}
+
+ private loadTile( neededIndex: number){
+ try {
+ const key = SaveTileToLocalStorageActor.storageKey + "-" + this.layer.layerDef.id + "-" + neededIndex
+ const data = localStorage.getItem(key)
+ const features = JSON.parse(data)
+ const src = {
+ layer: this.layer,
+ features: new UIEventSource<{ feature: any; freshness: Date }[]>(features),
+ name: "FromLocalStorage(" + key + ")",
+ tileIndex: neededIndex,
+ bbox: BBox.fromTileIndex(neededIndex)
+ }
+ this.handleFeatureSource(src, neededIndex)
+ this.loadedTiles.set(neededIndex, src)
+ } catch (e) {
+ console.error("Could not load data tile from local storage due to", e)
+ this.undefinedTiles.add(neededIndex)
+ }
+ }
}
\ No newline at end of file
diff --git a/Logic/SimpleMetaTagger.ts b/Logic/SimpleMetaTagger.ts
index 4cf5a8c471..b0e4d50bfb 100644
--- a/Logic/SimpleMetaTagger.ts
+++ b/Logic/SimpleMetaTagger.ts
@@ -209,7 +209,7 @@ export default class SimpleMetaTagger {
configurable: true,
get: () => {
delete feature.properties._isOpen
- feature.properties._isOpen = ""
+ feature.properties._isOpen = undefined
const tagsSource = State.state.allElements.getEventSourceById(feature.properties.id);
tagsSource.addCallbackAndRunD(tags => {
if (tags.opening_hours === undefined || tags._country === undefined) {
@@ -230,7 +230,8 @@ export default class SimpleMetaTagger {
const oldNextChange = tags["_isOpen:nextTrigger"] ?? 0;
if (oldNextChange > (new Date()).getTime() &&
- tags["_isOpen:oldvalue"] === tags["opening_hours"]) {
+ tags["_isOpen:oldvalue"] === tags["opening_hours"]
+ && tags["_isOpen"] !== undefined) {
// Already calculated and should not yet be triggered
return false;
}
@@ -267,7 +268,7 @@ export default class SimpleMetaTagger {
}
})
- return feature.properties["_isOpen"]
+ return undefined
}
})
diff --git a/Models/Constants.ts b/Models/Constants.ts
index a45d19e9ed..c79773971a 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import {Utils} from "../Utils";
export default class Constants {
- public static vNumber = "0.10.3";
+ public static vNumber = "0.10.5";
public static ImgurApiKey = '7070e7167f0a25a'
public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2'
public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"
diff --git a/Models/ThemeConfig/Json/LayoutConfigJson.ts b/Models/ThemeConfig/Json/LayoutConfigJson.ts
index 89439f529b..408bc10098 100644
--- a/Models/ThemeConfig/Json/LayoutConfigJson.ts
+++ b/Models/ThemeConfig/Json/LayoutConfigJson.ts
@@ -1,6 +1,5 @@
import {TagRenderingConfigJson} from "./TagRenderingConfigJson";
import {LayerConfigJson} from "./LayerConfigJson";
-import UnitConfigJson from "./UnitConfigJson";
/**
* Defines the entire theme.
@@ -253,7 +252,7 @@ export interface LayoutConfigJson {
* If set to [[lat0, lon0], [lat1, lon1]], the map will not scroll outside of those bounds.
* Off by default, which will enable panning to the entire world
*/
- lockLocation?: boolean | [[number, number], [number, number]];
+ lockLocation?: boolean | [[number, number], [number, number]] | number[][];
enableUserBadge?: boolean;
enableShareScreen?: boolean;
diff --git a/Models/ThemeConfig/LayoutConfig.ts b/Models/ThemeConfig/LayoutConfig.ts
index 51cf19d759..a06e329523 100644
--- a/Models/ThemeConfig/LayoutConfig.ts
+++ b/Models/ThemeConfig/LayoutConfig.ts
@@ -30,7 +30,7 @@ export default class LayoutConfig {
public layers: LayerConfig[];
public readonly clustering?: {
maxZoom: number,
- minNeededElements: number
+ minNeededElements: number,
};
public readonly hideFromOverview: boolean;
public lockLocation: boolean | [[number, number], [number, number]];
@@ -92,7 +92,7 @@ export default class LayoutConfig {
throw "Widenfactor too small"
}else{
// Unofficial themes get away with this
- console.warn("Detected a very small widenfactor, bumping this above 1.")
+ console.warn("Detected a very small widenfactor for theme ", this.id ,", bumping this above 1.")
json.widenFactor = json.widenFactor + 1
}
}
@@ -139,12 +139,17 @@ export default class LayoutConfig {
this.clustering = {
maxZoom: 16,
- minNeededElements: 25
+ minNeededElements: 25,
};
- if (json.clustering) {
+ if(json.clustering === false){
+ this.clustering = {
+ maxZoom: 0,
+ minNeededElements: 100000,
+ };
+ }else if (json.clustering) {
this.clustering = {
maxZoom: json.clustering.maxZoom ?? 18,
- minNeededElements: json.clustering.minNeededElements ?? 25
+ minNeededElements: json.clustering.minNeededElements ?? 25,
}
}
@@ -153,7 +158,7 @@ export default class LayoutConfig {
if (json.hideInOverview) {
throw "The json for " + this.id + " contains a 'hideInOverview'. Did you mean hideFromOverview instead?"
}
- this.lockLocation = json.lockLocation ?? undefined;
+ this.lockLocation = <[[number, number], [number, number]]> json.lockLocation ?? undefined;
this.enableUserBadge = json.enableUserBadge ?? true;
this.enableShareScreen = json.enableShareScreen ?? true;
this.enableMoreQuests = json.enableMoreQuests ?? true;
diff --git a/Models/TileRange.ts b/Models/TileRange.ts
index 7a542a2135..cccfe19643 100644
--- a/Models/TileRange.ts
+++ b/Models/TileRange.ts
@@ -15,7 +15,7 @@ export class Tiles {
public static MapRange(tileRange: TileRange, f: (x: number, y: number) => T): T[] {
const result: T[] = []
const total = tileRange.total
- if(total > 5000){
+ if(total > 100000){
throw "Tilerange too big"
}
for (let x = tileRange.xstart; x <= tileRange.xend; x++) {
diff --git a/UI/BigComponents/ThemeIntroductionPanel.ts b/UI/BigComponents/ThemeIntroductionPanel.ts
index fec58bb29f..ae37813252 100644
--- a/UI/BigComponents/ThemeIntroductionPanel.ts
+++ b/UI/BigComponents/ThemeIntroductionPanel.ts
@@ -50,13 +50,11 @@ export default class ThemeIntroductionPanel extends Combine {
)
super([
- layout.description.Clone(),
- "
"
}
]
}
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 509749aa03..30b6e90c6e 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -156,35 +156,40 @@
"dog-access": {
"question": {
"en": "Are dogs allowed in this business?",
- "nl": "Zijn honden toegelaten in deze zaak?"
+ "nl": "Zijn honden toegelaten in deze zaak?",
+ "pt": "Os cães são permitidos neste estabelecimento?"
},
"mappings": [
{
"if": "dog=yes",
"then": {
"en": "Dogs are allowed",
- "nl": "honden zijn toegelaten"
+ "nl": "honden zijn toegelaten",
+ "pt": "Os cães são permitidos"
}
},
{
"if": "dog=no",
"then": {
"en": "Dogs are not allowed",
- "nl": "honden zijn niet toegelaten"
+ "nl": "honden zijn niet toegelaten",
+ "pt": "Os cães não são permitidos"
}
},
{
"if": "dog=leashed",
"then": {
"en": "Dogs are allowed, but they have to be leashed",
- "nl": "honden zijn enkel aan de leiband welkom"
+ "nl": "honden zijn enkel aan de leiband welkom",
+ "pt": "Os cães são permitidos, mas têm de ser presos pela trela"
}
},
{
"if": "dog=unleashed",
"then": {
"en": "Dogs are allowed and can run around freely",
- "nl": "honden zijn welkom en mogen vrij rondlopen"
+ "nl": "honden zijn welkom en mogen vrij rondlopen",
+ "pt": "Os cães são permitidos e podem correr livremente"
}
}
]
@@ -247,7 +252,8 @@
"en": "Which methods of payment are accepted here?",
"nl": "Welke betaalmiddelen worden hier geaccepteerd?",
"pt": "Que métodos de pagamento são aceites aqui?",
- "pt_BR": "Quais métodos de pagamento são aceitos aqui?"
+ "pt_BR": "Quais métodos de pagamento são aceitos aqui?",
+ "id": "Metode pembayaran manakah yang di terima disini?"
},
"multiAnswer": true,
"mappings": [
@@ -258,7 +264,8 @@
"en": "Cash is accepted here",
"nl": "Cash geld wordt hier aanvaard",
"pt": "Aceitam pagamento com dinheiro aqui",
- "pt_BR": "Dinheiro é aceito aqui"
+ "pt_BR": "Dinheiro é aceito aqui",
+ "id": "Disini menerima pembayaran tunai"
}
},
{
@@ -268,7 +275,8 @@
"en": "Payment cards are accepted here",
"nl": "Betalen met bankkaarten kan hier",
"pt": "Aceitam pagamento com cartões bancários aqui",
- "pt_BR": "Cartões de pagamento são aceitos aqui"
+ "pt_BR": "Cartões de pagamento são aceitos aqui",
+ "id": "Disini menerima pembayaran dengan kartu"
}
}
]
@@ -292,7 +300,8 @@
"pl": "Na jakim poziomie znajduje się ta funkcja?",
"pt_BR": "Em que nível esse recurso está localizado?",
"ru": "На каком этаже находится этот объект?",
- "pt": "Em que nível se encontra este elemento?"
+ "pt": "Em que nível se encontra este elemento?",
+ "id": "Pada tingkat apa fitur ini diletakkan?"
},
"render": {
"en": "Located on the {level}th floor",
@@ -369,7 +378,8 @@
"fr": "Premier étage",
"pl": "Znajduje się na pierwszym piętrze",
"sv": "Ligger på första våningen",
- "pt": "Está no primeiro andar"
+ "pt": "Está no primeiro andar",
+ "id": "Berlokasi di lantai pertama"
}
}
]
diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json
index 4b49e7465f..54effec905 100644
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@@ -32,8 +32,8 @@
"enablePdfDownload": true,
"enableDownload": true,
"hideFromOverview": true,
- "clustering": {
"#": "Disable clustering for this theme",
+ "clustering": {
"maxZoom": 0
},
"layers": [
@@ -112,7 +112,7 @@
"geoJsonZoomLevel": 12,
"isOsmCache": true
},
- "minzoom": "13",
+ "minzoom": 10,
"icon": {
"render": "circle:#FE6F32;./assets/themes/natuurpunt/trail.svg",
"mappings": [
diff --git a/assets/themes/postboxes/license_info.json b/assets/themes/postboxes/license_info.json
new file mode 100644
index 0000000000..0c50f7040e
--- /dev/null
+++ b/assets/themes/postboxes/license_info.json
@@ -0,0 +1,25 @@
+[
+ {
+ "path": "post_office.svg",
+ "license": "CC BY-SA 4.0",
+ "authors": [
+ "https://github.com/emojione/emojione/graphs/contributors"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Emojione_BW_1F3E4.svg",
+ "https://github.com/emojione/emojione/blob/2.2.7/assets/svg_bw/1f3e4.svg"
+ ]
+ },
+ {
+ "path": "postbox.svg",
+ "license": "CC BY 4.0",
+ "authors": [
+ "Vincent Le Moign",
+ "https://twitter.com/webalys"
+ ],
+ "sources": [
+ "https://upload.wikimedia.org/wikipedia/commons/6/6d/726-postbox.svg",
+ "http://emoji.streamlineicons.com"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/themes/postboxes/post_office.svg b/assets/themes/postboxes/post_office.svg
new file mode 100644
index 0000000000..ebdd76b493
--- /dev/null
+++ b/assets/themes/postboxes/post_office.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/themes/postboxes/postbox.svg b/assets/themes/postboxes/postbox.svg
new file mode 100644
index 0000000000..05e6d95d4d
--- /dev/null
+++ b/assets/themes/postboxes/postbox.svg
@@ -0,0 +1,143 @@
+
+
+
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
new file mode 100644
index 0000000000..d90c5a1c39
--- /dev/null
+++ b/assets/themes/postboxes/postboxes.json
@@ -0,0 +1,174 @@
+{
+ "id": "postboxes",
+ "title": {
+ "en": "Postbox and Post Office Map"
+ },
+ "shortDescription": {
+ "en": "A map showing postboxes and post offices"
+ },
+ "description": {
+ "en": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :) Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. "
+ },
+ "language": [
+ "en"
+ ],
+ "maintainer": "",
+ "icon": "./assets/themes/postboxes/postbox.svg",
+ "version": "0",
+ "startLat": 53.5511,
+ "startLon": 9.9937,
+ "startZoom": 13,
+ "widenFactor": 1.5,
+ "defaultBackgroundId": "CartoDB.Voyager",
+ "clustering": {
+ "maxZoom": 14,
+ "minNeededElements": 100
+ },
+ "layers": [
+ {
+ "id": "postboxes",
+ "name": {
+ "en": "Postboxes"
+ },
+ "minzoom": 12,
+ "source": {
+ "osmTags": "amenity=post_box"
+ },
+ "title": {
+ "render": {
+ "en": "Postbox"
+ }
+ },
+ "description": {
+ "en": "The layer showing postboxes."
+ },
+ "tagRenderings": [
+ "images",
+ {
+ "id": "minimap",
+ "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
+ }
+ ],
+ "icon": {
+ "render": "./assets/themes/postboxes/postbox.svg"
+ },
+ "width": {
+ "render": "1"
+ },
+ "iconSize": {
+ "render": "40,40,bottom"
+ },
+ "color": {
+ "render": "#DADADA"
+ },
+ "presets": [
+ {
+ "tags": [
+ "amenity=post_box"
+ ],
+ "title": {
+ "en": "postbox"
+ }
+ }
+ ],
+ "wayHandling": 2,
+ "deletion": {
+ "softDeletionTags": {
+ "and": [
+ "amenity=",
+ "razed:amenity=post_box"
+ ]
+ }
+ }
+ },
+ {
+ "id": "postoffices",
+ "name": {
+ "en": "Post offices"
+ },
+ "minzoom": 12,
+ "source": {
+ "osmTags": "amenity=post_office"
+ },
+ "title": {
+ "render": {
+ "en": "Post Office"
+ }
+ },
+ "description": {
+ "en": "A layer showing post offices."
+ },
+ "tagRenderings": [
+ "images",
+ {
+ "id": "minimap",
+ "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
+ },
+ {
+ "render": {
+ "en": "Opening Hours: {opening_hours_table()}"
+ },
+ "freeform": {
+ "key": "opening_hours",
+ "type": "opening_hours"
+ },
+ "question": {
+ "en": "What are the opening hours for this post office?"
+ },
+ "mappings": [
+ {
+ "if": "opening_hours=24/7",
+ "then": {
+ "en": "24/7 opened (including holidays)"
+ }
+ }
+ ],
+ "id": "OH"
+ }
+ ],
+ "icon": {
+ "render": "square:white;./assets/themes/postboxes/post_office.svg"
+ },
+ "iconOverlays": [
+ {
+ "if": "opening_hours~*",
+ "then": "isOpen",
+ "badge": true
+ }
+ ],
+ "width": {
+ "render": "1"
+ },
+ "iconSize": {
+ "render": "40,40,bottom"
+ },
+ "color": {
+ "render": "#DADADA"
+ },
+ "presets": [
+ {
+ "tags": [
+ "amenity=post_office"
+ ],
+ "title": {
+ "en": "Post Office"
+ }
+ }
+ ],
+ "wayHandling": 2,
+ "filter": [
+ {
+ "id": "is_open",
+ "options": [
+ {
+ "question": {
+ "en": "Currently open"
+ },
+ "osmTags": "_isOpen=yes"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 2b303ea145..489c36ed7d 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -14,7 +14,10 @@
"nl": "Een kaart om toeristisch relevante info op aan te duiden"
},
"description": {
- "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
Eetgelegenheden
Cafés en bars
(Fiets)oplaadpunten
Fietspompen, fietserverhuur en fietswinkels
Uitkijktorens
...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.
Met de steun van Toerisme Vlaanderen"
+ "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
Eetgelegenheden
Cafés en bars
(Fiets)oplaadpunten
Fietspompen, fietserverhuur en fietswinkels
Uitkijktorens
...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken."
+ },
+ "descriptionTail": {
+ "nl": "Met de steun van Toerisme Vlaanderen"
},
"icon": "./assets/svg/star.svg",
"startZoom": 8,
@@ -28,16 +31,38 @@
"cafe_pub"
],
"override": {
- "minzoom": 16
+ "minzoom": 17
}
},
- "charging_station",
- "toilet",
- "bench",
- "waste_basket",
- "bike_repair_station",
- "binocular",
- "observation_tower"
+ {
+ "builtin": [
+ "bench",
+ "picnic_table",
+ "waste_basket"
+ ],
+ "override": {
+ "minzoom": 19
+ }
+ },
+ {
+ "builtin": [
+ "charging_station",
+ "toilet",
+ "bike_repair_station"
+ ],
+ "override": {
+ "minzoom": 14
+ }
+ },
+ {
+ "builtin": [
+ "binocular",
+ "observation_tower"
+ ],
+ "override": {
+ "minzoom": 10
+ }
+ }
],
"hideFromOverview": true
}
\ No newline at end of file
diff --git a/index.ts b/index.ts
index e5e58a6f0a..7126a0a7cc 100644
--- a/index.ts
+++ b/index.ts
@@ -63,7 +63,6 @@ if (path !== "index.html" && path !== "") {
defaultLayout = QueryParameters.GetQueryParameter("layout", defaultLayout, "The layout to load into MapComplete").data;
let layoutToUse: LayoutConfig = AllKnownLayouts.allKnownLayouts.get(defaultLayout.toLowerCase());
-
const userLayoutParam = QueryParameters.GetQueryParameter("userlayout", "false", "If not 'false', a custom (non-official) theme is loaded. This custom layout can be done in multiple ways: \n\n- The hash of the URL contains a base64-encoded .json-file containing the theme definition\n- The hash of the URL contains a lz-compressed .json-file, as generated by the custom theme generator\n- The parameter itself is an URL, in which case that URL will be downloaded. It should point to a .json of a theme");
// Workaround/legacy to keep the old paramters working as I renamed some of them
diff --git a/langs/en.json b/langs/en.json
index 27496d0176..78a21bdcf4 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -36,16 +36,6 @@
"splitTitle": "Choose on the map where to split this road",
"hasBeenSplit": "This way has been split"
},
- "move": {
- "loginToMove": "You must be logged in to move a point",
- "inviteToMove": "Move this point",
- "selectReason": "Why do you move this object?",
- "reasonRelocation": "The object has been relocated to a totally different location",
- "reasonInaccurate": "The location of this object is inaccurate and should be moved a few meter",
- "onlyPoints": "Only points can be moved",
- "isWay": "This feature is a way",
- "cancel": "Cancel move"
- },
"delete": {
"delete": "Delete",
"cancel": "Cancel",
@@ -130,7 +120,7 @@
},
"morescreen": {
"intro": "
More thematic maps?
Do you enjoy collecting geodata? There are more themes available.",
- "requestATheme": "If you want a custom-built quest, request it in the issue tracker",
+ "requestATheme": "If you want a custom-built theme, request it in the issue tracker",
"streetcomplete": "Another, similar application is StreetComplete.",
"createYourOwnTheme": "Create your own MapComplete theme from scratch"
},
@@ -231,7 +221,7 @@
},
"wikipedia": {
"wikipediaboxTitle": "Wikipedia",
- "failed":"Loading the wikipedia entry failed",
+ "failed": "Loading the wikipedia entry failed",
"loading": "Loading Wikipedia...",
"noWikipediaPage": "This wikidata item has no corresponding wikipedia page yet."
}
@@ -256,5 +246,15 @@
"tos": "If you create a review, you agree to the TOS and privacy policy of Mangrove.reviews",
"attribution": "Reviews are powered by Mangrove Reviews and are available under CC-BY 4.0.",
"plz_login": "Login to leave a review"
+ },
+ "move": {
+ "loginToMove": "You must be logged in to move a point",
+ "inviteToMove": "Move this point",
+ "selectReason": "Why do you move this object?",
+ "reasonRelocation": "The object has been relocated to a totally different location",
+ "reasonInaccurate": "The location of this object is inaccurate and should be moved a few meter",
+ "onlyPoints": "Only points can be moved",
+ "isWay": "This feature is a way",
+ "cancel": "Cancel move"
}
}
\ No newline at end of file
diff --git a/langs/pt.json b/langs/pt.json
index 577ee0f205..92db819cb1 100644
--- a/langs/pt.json
+++ b/langs/pt.json
@@ -20,5 +20,20 @@
"uploadingMultiple": "A enviar {count} imagens…",
"uploadingPicture": "A enviar a sua imagem…",
"addPicture": "Adicionar imagem"
+ },
+ "index": {
+ "#": "Estes textos são mostrados acima dos botões do tema quando nenhum tema é carregado",
+ "title": "Bem-vindo(a) ao MapComplete",
+ "intro": "O MapComplete é um visualizador e editor do OpenStreetMap, que mostra informações sobre um tema específico.",
+ "pickTheme": "Escolha um tema abaixo para começar."
+ },
+ "delete": {
+ "reasons": {
+ "notFound": "Não foi possível encontrar este elemento"
+ },
+ "explanations": {
+ "selectReason": "Por favor, selecione a razão porque este elemento deve ser eliminado",
+ "hardDelete": "Este ponto será eliminado no OpenStreetMap. Pode ser recuperado por um contribuidor com experiência"
+ }
}
}
diff --git a/langs/shared-questions/id.json b/langs/shared-questions/id.json
index 2af2d36ddc..7c29ed6e61 100644
--- a/langs/shared-questions/id.json
+++ b/langs/shared-questions/id.json
@@ -3,6 +3,25 @@
"email": {
"question": "Apa alamat surel dari {name}?"
},
+ "level": {
+ "mappings": {
+ "3": {
+ "then": "Berlokasi di lantai pertama"
+ }
+ },
+ "question": "Pada tingkat apa fitur ini diletakkan?"
+ },
+ "payment-options": {
+ "mappings": {
+ "0": {
+ "then": "Disini menerima pembayaran tunai"
+ },
+ "1": {
+ "then": "Disini menerima pembayaran dengan kartu"
+ }
+ },
+ "question": "Metode pembayaran manakah yang di terima disini?"
+ },
"phone": {
"question": "Nomor telepon dari {name|?"
},
diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json
index 9524e139d5..fbd7309863 100644
--- a/langs/shared-questions/pt.json
+++ b/langs/shared-questions/pt.json
@@ -3,6 +3,23 @@
"description": {
"question": "Ainda há algo de relevante que não tenha podido dar nas perguntas anteriores? Adicione-o aqui. Não repita factos já declarados"
},
+ "dog-access": {
+ "mappings": {
+ "0": {
+ "then": "Os cães são permitidos"
+ },
+ "1": {
+ "then": "Os cães não são permitidos"
+ },
+ "2": {
+ "then": "Os cães são permitidos, mas têm de ser presos pela trela"
+ },
+ "3": {
+ "then": "Os cães são permitidos e podem correr livremente"
+ }
+ },
+ "question": "Os cães são permitidos neste estabelecimento?"
+ },
"email": {
"question": "Qual é o endereço de e-mail de {name}?"
},
diff --git a/langs/themes/en.json b/langs/themes/en.json
index e1d8f67241..d239e32b10 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1371,5 +1371,56 @@
"description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself",
"shortDescription": "A map with waste baskets",
"title": "Waste Basket"
+ },
+ "postboxes": {
+ "description": "On this map you can find and add data of post offices and post boxes. You can use this map to find where you can mail your next postcard! :) Spotted an error or is a post box missing? You can edit this map with a free OpenStreetMap account. ",
+ "layers": {
+ "0": {
+ "description": "The layer showing postboxes.",
+ "name": "Postboxes",
+ "presets": {
+ "0": {
+ "title": "postbox"
+ }
+ },
+ "title": {
+ "render": "Postbox"
+ }
+ },
+ "1": {
+ "description": "A layer showing post offices.",
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Currently open"
+ }
+ }
+ }
+ },
+ "name": "Post offices",
+ "presets": {
+ "0": {
+ "title": "Post Office"
+ }
+ },
+ "tagRenderings": {
+ "OH": {
+ "mappings": {
+ "0": {
+ "then": "24/7 opened (including holidays)"
+ }
+ },
+ "question": "What are the opening hours for this post office?",
+ "render": "Opening Hours: {opening_hours_table()}"
+ }
+ },
+ "title": {
+ "render": "Post Office"
+ }
+ }
+ },
+ "shortDescription": "A map showing postboxes and post offices",
+ "title": "Postbox and Post Office Map"
}
}
\ No newline at end of file
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 409d96feaa..991614fad2 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1025,6 +1025,7 @@
},
"toerisme_vlaanderen": {
"description": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals:
Eetgelegenheden
Cafés en bars
(Fiets)oplaadpunten
Fietspompen, fietserverhuur en fietswinkels
Uitkijktorens
...
Zie je fouten op de kaart? Dan kan je zelf makkelijk aanpasingen maken, die zichtbaar zijn voor iedereen. Hiervoor dien je een gratis OpenStreetMap account voor te maken.
Met de steun van Toerisme Vlaanderen",
+ "descriptionTail": "Met de steun van Toerisme Vlaanderen",
"shortDescription": "Een kaart om toeristisch relevante info op aan te duiden",
"title": "Toeristisch relevante info"
},
diff --git a/scripts/generateCache.ts b/scripts/generateCache.ts
index 1377b3153e..c7fc2f04be 100644
--- a/scripts/generateCache.ts
+++ b/scripts/generateCache.ts
@@ -20,6 +20,7 @@ import FeatureSource, {FeatureSourceForLayer} from "../Logic/FeatureSource/Featu
import StaticFeatureSource from "../Logic/FeatureSource/Sources/StaticFeatureSource";
import TiledFeatureSource from "../Logic/FeatureSource/TiledFeatureSource/TiledFeatureSource";
import Constants from "../Models/Constants";
+import {GeoOperations} from "../Logic/GeoOperations";
ScriptUtils.fixUtils()
@@ -73,6 +74,7 @@ async function downloadRaw(targetdir: string, r: TileRange, theme: LayoutConfig,
let downloaded = 0
let failed = 0
let skipped = 0
+ const startTime = new Date().getTime()
for (let x = r.xstart; x <= r.xend; x++) {
for (let y = r.ystart; y <= r.yend; y++) {
downloaded++;
@@ -82,7 +84,11 @@ async function downloadRaw(targetdir: string, r: TileRange, theme: LayoutConfig,
skipped++
continue;
}
- console.log("x:", (x - r.xstart), "/", (r.xend - r.xstart), "; y:", (y - r.ystart), "/", (r.yend - r.ystart), "; total: ", downloaded, "/", r.total, "failed: ", failed, "skipped: ", skipped)
+ const runningSeconds = (new Date().getTime() - startTime) / 1000
+ const resting = failed + (r.total - downloaded)
+ const perTile= (runningSeconds / (downloaded - skipped))
+ const estimated =Math.floor(resting * perTile)
+ console.log("total: ", downloaded, "/", r.total, "failed: ", failed, "skipped: ", skipped, "running time: ",Utils.toHumanTime(runningSeconds)+"s", "estimated left: ", Utils.toHumanTime(estimated), "("+Math.floor(perTile)+"s/tile)")
const boundsArr = Tiles.tile_bounds(r.zoomlevel, x, y)
const bounds = {
@@ -91,7 +97,7 @@ async function downloadRaw(targetdir: string, r: TileRange, theme: LayoutConfig,
east: Math.max(boundsArr[0][1], boundsArr[1][1]),
west: Math.min(boundsArr[0][1], boundsArr[1][1])
}
- const overpass = createOverpassObject(theme, relationTracker, Constants.defaultOverpassUrls[(downloaded + failed) % Constants.defaultOverpassUrls.length])
+ const overpass = createOverpassObject(theme, relationTracker, Constants.defaultOverpassUrls[(failed) % Constants.defaultOverpassUrls.length])
const url = overpass.buildQuery("[bbox:" + bounds.south + "," + bounds.west + "," + bounds.north + "," + bounds.east + "]")
try {
@@ -170,11 +176,11 @@ function loadAllTiles(targetdir: string, r: TileRange, theme: LayoutConfig, extr
/**
* Load all the tiles into memory from disk
*/
-function postProcess(allFeatures: FeatureSource, theme: LayoutConfig, relationsTracker: RelationsTracker, targetdir: string) {
-
-
+function sliceToTiles(allFeatures: FeatureSource, theme: LayoutConfig, relationsTracker: RelationsTracker, targetdir: string, pointsOnlyLayers: string[]) {
function handleLayer(source: FeatureSourceForLayer) {
const layer = source.layer.layerDef;
+ const targetZoomLevel = layer.source.geojsonZoomLevel ?? 0
+
const layerId = layer.id
if (layer.source.isOsmCacheLayer !== true) {
return;
@@ -200,13 +206,10 @@ function postProcess(allFeatures: FeatureSource, theme: LayoutConfig, relationsT
// At this point, we have all the features of the entire area.
// However, we want to export them per tile of a fixed size, so we use a dynamicTileSOurce to split it up
TiledFeatureSource.createHierarchy(source, {
- minZoomLevel: 14,
- maxZoomLevel: 14,
+ minZoomLevel: targetZoomLevel,
+ maxZoomLevel: targetZoomLevel,
maxFeatureCount: undefined,
registerTile: tile => {
- if (tile.z < 12) {
- return;
- }
if (tile.features.data.length === 0) {
return
}
@@ -229,7 +232,7 @@ function postProcess(allFeatures: FeatureSource, theme: LayoutConfig, relationsT
// All the tiles are written at this point
// Only thing left to do is to create the index
- const path = targetdir + "_" + layerId + "_overview.json"
+ const path = targetdir + "_" + layerId + "_" + targetZoomLevel + "_overview.json"
const perX = {}
createdTiles.map(i => Tiles.tile_from_index(i)).forEach(([z, x, y]) => {
const key = "" + x
@@ -240,7 +243,18 @@ function postProcess(allFeatures: FeatureSource, theme: LayoutConfig, relationsT
})
writeFileSync(path, JSON.stringify(perX))
-
+ // And, if needed, to create a points-only layer
+ if(pointsOnlyLayers.indexOf(layer.id) >= 0){
+ const features = source.features.data.map(f => f.feature)
+ const points = features.map(feature => GeoOperations.centerpoint(feature))
+ console.log("Writing points overview for ", layerId)
+ const targetPath = targetdir+"_"+layerId+"_points.geojson"
+ // This is the geojson file containing all features for this tile
+ writeFileSync(targetPath, JSON.stringify({
+ type: "FeatureCollection",
+ features: points
+ }, null, " "))
+ }
}
new PerLayerFeatureSourceSplitter(
@@ -255,10 +269,11 @@ function postProcess(allFeatures: FeatureSource, theme: LayoutConfig, relationsT
}
+
async function main(args: string[]) {
if (args.length == 0) {
- console.error("Expected arguments are: theme zoomlevel targetdirectory lat0 lon0 lat1 lon1 [--generate-point-overview layer-name]")
+ console.error("Expected arguments are: theme zoomlevel targetdirectory lat0 lon0 lat1 lon1 [--generate-point-overview layer-name,layer-name,...]")
return;
}
const themeName = args[0]
@@ -268,6 +283,12 @@ async function main(args: string[]) {
const lon0 = Number(args[4])
const lat1 = Number(args[5])
const lon1 = Number(args[6])
+
+ let generatePointLayersFor = []
+ if(args[7] == "--generate-point-overview"){
+ generatePointLayersFor = args[8].split(",")
+ }
+
const tileRange = Tiles.TileRangeBetween(zoomlevel, lat0, lon0, lat1, lon1)
@@ -293,7 +314,7 @@ async function main(args: string[]) {
const extraFeatures = await downloadExtraData(theme);
const allFeaturesSource = loadAllTiles(targetdir, tileRange, theme, extraFeatures)
- postProcess(allFeaturesSource, theme, relationTracker, targetdir)
+ sliceToTiles(allFeaturesSource, theme, relationTracker, targetdir, generatePointLayersFor)
}
"
+ "nl": "Op deze kaart kan je info zien die relevant is voor toerisme, zoals: