forked from MapComplete/MapComplete
Merge develop
This commit is contained in:
commit
08ffe4b7c0
146 changed files with 4380 additions and 1435 deletions
|
@ -1,6 +1,7 @@
|
|||
import * as packagefile from "../../package.json"
|
||||
import * as extraconfig from "../../config.json"
|
||||
import { Utils } from "../Utils"
|
||||
import { AuthConfig } from "../Logic/Osm/AuthConfig"
|
||||
|
||||
export type PriviligedLayerType = (typeof Constants.priviliged_layers)[number]
|
||||
|
||||
|
@ -104,8 +105,9 @@ export default class Constants {
|
|||
public static ImgurApiKey = Constants.config.api_keys.imgur
|
||||
public static readonly mapillary_client_token_v4 = Constants.config.api_keys.mapillary_v4
|
||||
public static defaultOverpassUrls = Constants.config.default_overpass_urls
|
||||
static countryCoderEndpoint: string = Constants.config.country_coder_host
|
||||
|
||||
public static countryCoderEndpoint: string = Constants.config.country_coder_host
|
||||
public static osmAuthConfig: AuthConfig = Constants.config.oauth_credentials
|
||||
public static nominatimEndpoint: string = Constants.config.nominatimEndpoint
|
||||
/**
|
||||
* These are the values that are allowed to use as 'backdrop' icon for a map pin
|
||||
*/
|
||||
|
|
|
@ -13,7 +13,6 @@ export interface MapProperties {
|
|||
readonly allowMoving: UIEventSource<true | boolean>
|
||||
readonly allowRotating: UIEventSource<true | boolean>
|
||||
readonly lastClickLocation: Store<{ lon: number; lat: number }>
|
||||
|
||||
readonly allowZooming: UIEventSource<true | boolean>
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ import Combine from "../../UI/Base/Combine"
|
|||
import { VariableUiElement } from "../../UI/Base/VariableUIElement"
|
||||
import { TagRenderingConfigJson } from "./Json/TagRenderingConfigJson"
|
||||
import SvelteUIElement from "../../UI/Base/SvelteUIElement"
|
||||
import Marker from "../../UI/Map/Marker.svelte"
|
||||
import DynamicMarker from "../../UI/Map/DynamicMarker.svelte"
|
||||
|
||||
export class IconConfig extends WithContextLoader {
|
||||
|
@ -83,7 +82,7 @@ export default class PointRenderingConfig extends WithContextLoader {
|
|||
})
|
||||
|
||||
if (json.marker === undefined && json.label === undefined) {
|
||||
throw `${context}: A point rendering should define at least an icon or a marker`
|
||||
throw `At ${context}: A point rendering should define at least an marker or a label`
|
||||
}
|
||||
|
||||
if (this.location.size == 0) {
|
||||
|
|
|
@ -141,7 +141,6 @@ export default class ThemeViewState implements SpecialVisualizationState {
|
|||
undefined,
|
||||
"Used to complete the login"
|
||||
),
|
||||
osmConfiguration: <"osm" | "osm-test">this.featureSwitches.featureSwitchApiURL.data,
|
||||
})
|
||||
this.userRelatedState = new UserRelatedState(
|
||||
this.osmConnection,
|
||||
|
@ -538,7 +537,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
|
|||
this.mapProperties.maxbounds.setData(bbox)
|
||||
ShowDataLayer.showRange(
|
||||
this.map,
|
||||
new StaticFeatureSource([bbox.asGeoJson({})]),
|
||||
new StaticFeatureSource([bbox.asGeoJson({ id: "range" })]),
|
||||
this.featureSwitches.featureSwitchIsTesting
|
||||
)
|
||||
}
|
||||
|
@ -576,7 +575,6 @@ export default class ThemeViewState implements SpecialVisualizationState {
|
|||
}
|
||||
|
||||
this.featureProperties.trackFeatureSource(features)
|
||||
// this.indexedFeatures.addSource(features)
|
||||
new ShowDataLayer(this.map, {
|
||||
features,
|
||||
doShowLayer: flayer.isDisplayed,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue