Merge branch 'master' into develop

src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts

@@ -111,7 +111,7 @@ export default class CreateNoteImportLayer extends Conversion<LayerConfigJson, L
             },
             calculatedTags: [
                 "_first_comment=get(feat)('comments')[0].text.toLowerCase()",
-                "_trigger_index=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.osm.be/\\([a-zA-Z_-]+\\)\\(.html\\)?.*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()",
+                "_trigger_index=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.\\(org|osm.be\\)/\\([a-zA-Z_-]+\\)\\(.html\\)?.*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()",
                 "_comments_count=get(feat)('comments').length",
                 "_intro=(() => {const lines = get(feat)('comments')[0].text.split('\\n'); lines.splice(get(feat)('_trigger_index')-1, lines.length); return lines.filter(l => l !== '').join('<br/>');})()",
                 "_tags=(() => {let lines = get(feat)('comments')[0].text.split('\\n').map(l => l.trim()); lines.splice(0, get(feat)('_trigger_index') + 1); lines = lines.filter(l => l != ''); return lines.join(';');})()",

src/Models/ThemeConfig/Json/LayoutConfigJson.ts

@@ -228,7 +228,7 @@ export interface LayoutConfigJson {
      *
      * Note that {lat},{lon},{zoom}, {language} and {theme} will be replaced
      *
-     * Default: {icon: "./assets/svg/pop-out.svg", href: 'https://mapcomplete.osm.be/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: ["iframe","no-welcome-message]},
+     * Default: {icon: "./assets/svg/pop-out.svg", href: 'https://mapcomplete.org/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: ["iframe","no-welcome-message]},
      *
      */
     extraLink?: ExtraLinkConfigJson

src/Models/ThemeConfig/LayerConfig.ts

@@ -496,7 +496,7 @@ export default class LayerConfig extends WithContextLoader {
                 new Title("Themes using this layer", 4),
                 new List(
                     (usedInThemes ?? []).map(
-                        (id) => new Link(id, "https://mapcomplete.osm.be/" + id)
+                        (id) => new Link(id, "https://mapcomplete.org/" + id)
                     )
                 ),
             ]
@@ -542,7 +542,7 @@ export default class LayerConfig extends WithContextLoader {
                         new Combine([
                             new Link(
                                 Utils.runningFromConsole
-                                    ? "<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>"
+                                    ? "<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>"
                                     : Svg.statistics_svg().SetClass("w-4 h-4 mr-2"),
                                 "https://taginfo.openstreetmap.org/keys/" + values.key + "#values",
                                 true
@@ -579,7 +579,7 @@ export default class LayerConfig extends WithContextLoader {
             // This is for the documentation in a markdown-file, so we have to use raw HTML
             if (icon !== undefined) {
                 iconImg = new FixedUiElement(
-                    `<img src='https://mapcomplete.osm.be/${icon}' height="100px"> `
+                    `<img src='https://mapcomplete.org/${icon}' height="100px"> `
                 )
             }
         } else {

src/Models/ThemeViewState.ts

@@ -204,6 +204,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
                 (id) => self.layerState.filteredLayers.get(id).isDisplayed,
                 this.fullNodeDatabase
             )
+
             this.indexedFeatures = layoutSource
 
             const empty = []
@@ -225,9 +226,6 @@ export default class ThemeViewState implements SpecialVisualizationState {
             )
             this.featuresInView = new BBoxFeatureSource(layoutSource, this.mapProperties.bounds)
             this.dataIsLoading = layoutSource.isLoading
-            this.dataIsLoading.addCallbackAndRunD((loading) =>
-                console.log("Data is loading?", loading)
-            )
 
             const indexedElements = this.indexedFeatures
             this.featureProperties = new FeaturePropertiesStore(indexedElements)
@@ -345,13 +343,13 @@ export default class ThemeViewState implements SpecialVisualizationState {
                 [fs.layer.isDisplayed]
             )
 
-            if (
-                !doShowLayer.data &&
-                (this.featureSwitches.featureSwitchFilter.data === false || !fs.layer.layerDef.name)
-            ) {
+            if (!doShowLayer.data && this.featureSwitches.featureSwitchFilter.data === false) {
                 /* This layer is hidden and there is no way to enable it (filterview is disabled or this layer doesn't show up in the filter view as the name is not defined)
                  *
                  * This means that we don't have to filter it, nor do we have to display it
+                 *
+                 * Note: it is tempting to also permanently disable the layer if it is not visible _and_ the layer name is hidden.
+                 * However, this is _not_ correct: the layer might be hidden because zoom is not enough. Zooming in more _will_ reveal the layer!
                  * */
                 return
             }