Skip to content

Commit

Permalink
add cypher for Charles III (fixes #4420)
Browse files Browse the repository at this point in the history
  • Loading branch information
@westnordost
westnordost committed Sep 27, 2022
1 parent b355c1d commit c1fc7ec
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 9 deletions.
1 change: 1 addition & 0 deletions ...main/java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/PostboxRoyalCypher.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ enum class PostboxRoyalCypher(val osmValue: String) {
EDWARD_VII("EVIIR"),
SCOTTISH_CROWN("scottish_crown"),
EDWARD_VIII("EVIIIR"),
CHARLES_III("CIIIR"),
NONE("no")
}
11 changes: 3 additions & 8 deletions .../java/de/westnordost/streetcomplete/quests/postbox_royal_cypher/PostboxRoyalCypherItem.kt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
package de.westnordost.streetcomplete.quests.postbox_royal_cypher

import de.westnordost.streetcomplete.R
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.EDWARD_VII
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.EDWARD_VIII
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.ELIZABETH_II
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.GEORGE_V
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.GEORGE_VI
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.NONE
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.SCOTTISH_CROWN
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.VICTORIA
import de.westnordost.streetcomplete.quests.postbox_royal_cypher.PostboxRoyalCypher.*
import de.westnordost.streetcomplete.view.image_select.DisplayItem
import de.westnordost.streetcomplete.view.image_select.Item

Expand All @@ -26,6 +19,7 @@ private val PostboxRoyalCypher.titleResId: Int? get() = when (this) {
EDWARD_VII -> R.string.quest_postboxRoyalCypher_type_eviir
SCOTTISH_CROWN -> R.string.quest_postboxRoyalCypher_type_scottish_crown
EDWARD_VIII -> R.string.quest_postboxRoyalCypher_type_eviiir
CHARLES_III -> R.string.quest_postboxRoyalCypher_type_ciiir
NONE -> null
}

Expand All @@ -37,5 +31,6 @@ private val PostboxRoyalCypher.iconResId: Int? get() = when (this) {
EDWARD_VII -> R.drawable.ic_postbox_royal_cypher_eviir
SCOTTISH_CROWN -> R.drawable.ic_postbox_royal_cypher_scottish_crown
EDWARD_VIII -> R.drawable.ic_postbox_royal_cypher_eviiir
CHARLES_III -> R.drawable.ic_postbox_royal_cypher_ciiir
NONE -> null
}
36 changes: 36 additions & 0 deletions app/src/main/res/drawable/ic_postbox_royal_cypher_ciiir.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:pathData="m90.73,101.7c-3.06,1.14 -6.42,2.08 -10.08,2.74 0.07,0.1 0.14,0.2 0.21,0.3 5.86,8.17 11.86,18.75 22.8,18.25 3.3,-0.15 6.51,-0.1 10.35,-0.96l-0.14,-1.44c-9.77,0.67 -17.68,-9.99 -22.82,-18.37 -0.11,-0.18 -0.21,-0.34 -0.32,-0.52z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
<path
android:pathData="m71.73,67.18v-0.78c-0.82,-0.57 -1.11,-1.82 -1.04,-3.24v-15.81c-0.06,-1.43 0.22,-2.67 1.04,-3.24v-0.64h-5.64v0.64c0.82,0.57 1.11,1.82 1.04,3.24v15.81c0.06,1.43 -0.22,2.67 -1.04,3.24v0.78z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
<path
android:pathData="m63.13,67.18v-0.78c-0.82,-0.57 -1.11,-1.82 -1.04,-3.24v-15.81c-0.06,-1.43 0.22,-2.67 1.04,-3.24v-0.64h-5.64v0.64c0.82,0.57 1.11,1.82 1.04,3.24v15.81c0.06,1.43 -0.22,2.67 -1.04,3.24v0.78z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
<path
android:pathData="m80.33,67.18v-0.78c-0.82,-0.57 -1.11,-1.82 -1.04,-3.24v-15.81c-0.06,-1.43 0.22,-2.67 1.04,-3.24v-0.64h-5.64v0.64c0.82,0.57 1.11,1.82 1.04,3.24v15.81c0.06,1.43 -0.22,2.67 -1.04,3.24v0.78z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
<path
android:pathData="m106.48,31.75 l-1.52,-19.91s-2.27,1.16 -4.02,0.78c-9.21,-1.98 -27.08,-12.09 -50.15,-5.34 -28.07,8.2 -36.3,33.93 -36.29,49.98 0.02,26.53 20.88,43.35 40.26,46.84 24.92,4.49 41.21,-3.18 51.07,-10.84l1.63,-11.3 -1.05,0.42c-7.37,15.03 -29.73,22.95 -50.71,17.47 -7.96,-2.08 -15.33,-6.74 -20.68,-13.69 -6.22,-8.07 -9.82,-19.05 -10,-30.27 -0.32,-19.33 9.62,-38.97 27.19,-44.08 11.13,-3.23 20.15,-2.65 27.38,-0.93 19.3,4.6 25.88,20.84 25.88,20.84z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
<path
android:pathData="m64.87,26.25c-1.49,-0 -3.03,0.05 -4.62,0.15 -11.7,0.79 -24.59,2.44 -24.59,2.44l0.19,1.51c1.84,0.35 5.08,0.16 5.08,4.15v78.49c0,8.14 -3.11,7.56 -4.71,9.06v0.77h18.82v-0.77c-1.6,-1.49 -4.71,-0.91 -4.71,-9.06 0,-9.45 0.18,-19.05 0.4,-28.69 4.54,-0.14 11.39,-0.38 15.31,1.75 3.32,1.8 7.01,7.53 12.06,14.81 3.61,-0.61 7.08,-1.59 10.3,-2.9 -4.15,-6.68 -7.43,-11.54 -11.97,-15.62 0,0 22.67,-6.54 22.76,-27.85 0.06,-15.97 -11.94,-28.18 -34.34,-28.24zM62.47,30.08c4.78,0.06 10.66,0.11 17.11,3.93 5.6,3.32 10.38,9.9 10.84,21.61 0.5,12.44 -6.36,19.78 -15.35,23.14 -8.38,3.14 -17.58,1.83 -24.22,0.5 0.33,-13.98 0.7,-28 0.7,-41.69v-4.15c0,-1.01 0.15,-1.71 0.5,-2.13 0.65,-0.77 8.12,-1.24 10.41,-1.21z"
android:strokeWidth="2"
android:fillColor="#ef4f3e"
android:strokeColor="#a13125"/>
</vector>
3 changes: 2 additions & 1 deletion app/src/main/res/raw/changelog.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
v47.0-beta1: |
v47.0: |
<h3>🅿️ Street Parking Overlay (#4177, #4329)</h3>
<p>Comprehensively record the physical parking situation along the streets in your neighborhood!<br/>
Be warned, of the overlays so far, this is the most complex one and the first that does not
Expand All @@ -14,6 +14,7 @@ v47.0-beta1: |
<li>Performance improvement when scrolling the map (#4283), by @Helium314</li>
<li>Refine when the entrance type quest is asked (#4372, #4380), by @matkoniecz</li>
<li>Other minor enhancements (#4380, #4381, #4393), thanks @matkoniecz, @HolgerJeromin, @mcliquid</li>
<li>Postbox Cyphers: Now possible to select the cypher for Charles III (#4420)</li>
</ul>
<h3>Fixes</h3>
<ul>
Expand Down
1 change: 1 addition & 0 deletions res/graphics/authors.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ roof shape/
skillion_west.svg

royal cypher/
CIIIR.svg CC-BY-SA 3.0 https://commons.wikimedia.org/wiki/File:Royal_Cypher_of_King_Charles_III.svg (adapted)
EIIR.svg CC-BY-SA 3.0 https://commons.wikimedia.org/wiki/File:Royal_Cypher_of_Queen_Elizabeth_II.svg (adapted)
EVIIIR.svg Public Domain https://commons.wikimedia.org/wiki/File:EVIIIR.PNG (adapted)
EVIIR.svg CC-BY-SA 4.0 https://commons.wikimedia.org/wiki/File:Royal_Monogram_of_King_Edward_VII_of_Great_Britain_goldenrod.svg (adapted)
Expand Down
11 changes: 11 additions & 0 deletions res/graphics/royal cypher/CIIIR.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c1fc7ec

Please sign in to comment.