Enable more privacy for some themes and layers

src/Logic/Osm/Changes.ts

@@ -19,6 +19,7 @@ import Title from "../../UI/Base/Title"
 import Table from "../../UI/Base/Table"
 import ChangeLocationAction from "./Actions/ChangeLocationAction"
 import ChangeTagAction from "./Actions/ChangeTagAction"
+import FeatureSwitchState from "../State/FeatureSwitchState"
 
 /**
  * Handles all changes made to OSM.
@@ -28,7 +29,7 @@ export class Changes {
     public readonly pendingChanges: UIEventSource<ChangeDescription[]> =
         LocalStorageSource.GetParsed<ChangeDescription[]>("pending-changes", [])
     public readonly allChanges = new UIEventSource<ChangeDescription[]>(undefined)
-    public readonly state: { allElements?: IndexedFeatureSource; osmConnection: OsmConnection }
+    public readonly state: { allElements?: IndexedFeatureSource; osmConnection: OsmConnection, featureSwitches?: FeatureSwitchState }
     public readonly extraComment: UIEventSource<string> = new UIEventSource(undefined)
     public readonly backend: string
     public readonly isUploading = new UIEventSource(false)
@@ -45,7 +46,8 @@ export class Changes {
             allElements?: IndexedFeatureSource
             featurePropertiesStore?: FeaturePropertiesStore
             osmConnection: OsmConnection
-            historicalUserLocations?: FeatureSource
+            historicalUserLocations?: FeatureSource,
+            featureSwitches?: FeatureSwitchState
         },
         leftRightSensitive: boolean = false
     ) {
@@ -431,6 +433,9 @@ export class Changes {
             // Probably irrelevant, such as a new helper node
             return
         }
+        if(this.state.featureSwitches.featureSwitchMorePrivacy?.data){
+            return
+        }
 
         const now = new Date()
         const recentLocationPoints = locations

src/Logic/Osm/ChangesetHandler.ts

@@ -6,14 +6,6 @@ import Constants from "../../Models/Constants"
 import { Changes } from "./Changes"
 import { Utils } from "../../Utils"
 import FeaturePropertiesStore from "../FeatureSource/Actors/FeaturePropertiesStore"
-import ChangeLocationAction from "./Actions/ChangeLocationAction"
-import ChangeTagAction from "./Actions/ChangeTagAction"
-import DeleteAction from "./Actions/DeleteAction"
-import LinkImageAction from "./Actions/LinkImageAction"
-import OsmChangeAction from "./Actions/OsmChangeAction"
-import RelationSplitHandler from "./Actions/RelationSplitHandler"
-import ReplaceGeometryAction from "./Actions/ReplaceGeometryAction"
-import SplitAction from "./Actions/SplitAction"
 
 export interface ChangesetTag {
     key: string
@@ -232,7 +224,7 @@ export class ChangesetHandler {
             if (newMetaTag === undefined) {
                 extraMetaTags.push({
                     key: key,
-                    value: oldCsTags[key],
+                    value: oldCsTags[key]
                 })
                 continue
             }
@@ -361,21 +353,22 @@ export class ChangesetHandler {
     }
 
     private defaultChangesetTags(): ChangesetTag[] {
+        const usedGps = this.changes.state["currentUserLocation"]?.features?.data?.length > 0
+        const hasMorePrivacy = !!this.changes.state?.featureSwitches?.featureSwitchMorePrivacy?.data
+        const setSourceAsSurvey = !hasMorePrivacy && usedGps
         return [
             ["created_by", `MapComplete ${Constants.vNumber}`],
             ["locale", Locale.language.data],
             ["host", `${window.location.origin}${window.location.pathname}`],
             [
                 "source",
-                this.changes.state["currentUserLocation"]?.features?.data?.length > 0
-                    ? "survey"
-                    : undefined,
+                setSourceAsSurvey                    ? "survey"                    : undefined
             ],
-            ["imagery", this.changes.state["backgroundLayer"]?.data?.id],
+            ["imagery", this.changes.state["backgroundLayer"]?.data?.id]
         ].map(([key, value]) => ({
             key,
             value,
-            aggregate: false,
+            aggregate: false
         }))
     }
 

src/Logic/State/FeatureSwitchState.ts

@@ -63,6 +63,7 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
     public readonly overpassMaxZoom: UIEventSource<number>
     public readonly osmApiTileSize: UIEventSource<number>
     public readonly backgroundLayerId: UIEventSource<string>
+    public readonly featureSwitchMorePrivacy: UIEventSource<boolean>
 
     public constructor(layoutToUse?: LayoutConfig) {
         super()
@@ -164,6 +165,14 @@ export default class FeatureSwitchState extends OsmConnectionFeatureSwitches {
             "If true, shows some extra debugging help such as all the available tags on every object"
         )
 
+
+        this.featureSwitchMorePrivacy = QueryParameters.GetBooleanQueryParameter(
+            "moreprivacy",
+            layoutToUse.enableMorePrivacy,
+            "If true, the location distance indication will not be written to the changeset and other privacy enhancing measures might be taken."
+        )
+
+
         this.overpassUrl = QueryParameters.GetQueryParameter(
             "overpassUrl",
             (layoutToUse?.overpassUrl ?? Constants.defaultOverpassUrls).join(","),