Merge branch 'mnalis-helium314' into mnalis-helium314-questorder

mnalis · Jul 12, 2021 · 6dc82e8 · 6dc82e8
2 parents d57f028 + 26a1782
commit 6dc82e8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/CHANGES-mnalis.md b/CHANGES-mnalis.md
@@ -35,13 +35,28 @@ Cherry-picked from `helium314` branch (from https://github.com/Helium314/StreetC
     * add button to reverse quest order (commit 1982e79ef618444bc41cb609f9d5270805a24ab2)
     * auto-download only if auto-upload is allowed (commit 52cf846a7544c5c1fbf39f1ef0cae8eb93b945ab)
 
+* get icon for phone quest from atrate branch?
+  to update `helium314` quest.
+  Maybe even check `atrate` code for such quest and merge/replace?
+
 * allow house address quest even if no building type ?
   See [issue #2464](https://github.com/streetcomplete/StreetComplete/issues/2464)
 * add language selector (or force language to HR in this fork if it is much simpler)
   See https://github.com/streetcomplete/StreetComplete/issues/2964#issuecomment-862609036 and related issues.
 * fix helium314 presets crashing on initial setup?
 * replace helium314 reverse quest order button with quick preset change button?
 * check https://github.com/matkoniecz/Zazolc ?
-* https://github.com/Atrate/CompleteStreet
-    * show more lit quests
-    * show more surface quests
+* make GitHub build signed version, so upgrade does not mean uninstalling and losing all preferences
+  https://medium.com/upday-devs/how-to-setup-github-actions-for-android-projects-a94e8e3b0539
+  https://danielllewellyn.medium.com/flutter-github-actions-for-a-signed-apk-fcdf9878f660
+  https://github.com/actions/upload-release-asset
+  https://github.com/actions/create-release
+  https://github.com/ShaunLWM/action-release-debugapk
+  https://github.com/ad-m/github-push-action
+  https://github.com/r0adkll/sign-android-release
+  https://github.com/marketplace/actions/sign-android-release
+  https://github.com/marketplace/actions/android-sign
+  https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions
+  https://coletiv.com/blog/android-github-actions-setup/
+  https://riggaroo.dev/using-github-actions-to-automate-our-release-process/
+  https://medium.com/google-developer-experts/github-actions-for-android-developers-6b54c8a32f55
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/surface/AddRoadSurface.kt
@@ -61,9 +61,10 @@ class AddRoadSurface : OsmFilterQuestType<SurfaceAnswer>() {
         // well, all roads have surfaces, what I mean is that not all ways with highway key are
         // "something with a surface"
         private val ROADS_WITH_SURFACES = arrayOf(
-            // "trunk","trunk_link","motorway","motorway_link", // too much, motorways are almost by definition asphalt (or concrete)
+            "trunk","trunk_link","motorway","motorway_link", // too much, motorways are almost by definition asphalt (or concrete)
             "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link",
-            "unclassified", "residential", "living_street", "pedestrian", "track", "road"
-        )/*"service", */// this is too much, and the information value is very low
+            "service", // this is too much, and the information value is very low
+            "unclassified", "residential", "living_street", "pedestrian", "track", "road",
+        )
     }
 }
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/way_lit/AddWayLit.kt
@@ -19,24 +19,14 @@ class AddWayLit : OsmFilterQuestType<WayLit>() {
     override val elementFilter = """
         ways with
         (
-          highway ~ ${LIT_RESIDENTIAL_ROADS.joinToString("|")}
-          or highway ~ ${LIT_NON_RESIDENTIAL_ROADS.joinToString("|")} and
-          (
-            sidewalk ~ both|left|right|yes|separate
-            or ~${(MAXSPEED_TYPE_KEYS + "maxspeed").joinToString("|")} ~ .*urban|.*zone.*
-            or maxspeed <= 60
-            or maxspeed ~ "(5|10|15|20|25|30|35) mph"
-          )
-          or highway ~ ${LIT_WAYS.joinToString("|")}
-          or highway = path and (foot = designated or bicycle = designated)
+          highway
         )
         and
         (
           !lit
           or lit = no and lit older today -8 years
           or lit older today -16 years
         )
-        and (access !~ private|no or (foot and foot !~ private|no))
         and indoor != yes
     """