elgaard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Add QR-code to all popups, add direction indicator to popup and visual feedback, make reviews accessible to screenreaders (both to read them and to make them)

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-12-24 05:01:10 +01:00
parent 5567869bb4
commit bfd818cb38
33 changed files with 415 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Logic/Actors/GeoLocationHandler.ts
View file

@ -10,6 +10,7 @@ import { GeoOperations } from "../GeoOperations"
import { OsmTags } from "../../Models/OsmFeature"
import StaticFeatureSource from "../FeatureSource/Sources/StaticFeatureSource"
import { MapProperties } from "../../Models/MapProperties"
import { Orientation } from "../../Sensors/Orientation"
/**
* The geolocation-handler takes a map-location and a geolocation state.
@ -128,10 +129,10 @@ export default class GeoLocationHandler {
}
// We check that the GPS location is not out of bounds
const bounds = this.mapProperties.maxbounds.data
const bounds: BBox = this.mapProperties.maxbounds.data
if (bounds !== undefined) {
// B is an array with our lock-location
const inRange = new BBox(bounds).contains([newLocation.longitude, newLocation.latitude])
const inRange = bounds.contains([newLocation.longitude, newLocation.latitude])
if (!inRange) {
return
}
@ -167,6 +168,9 @@ export default class GeoLocationHandler {
altitude: location.altitude,
altitudeAccuracy: location.altitudeAccuracy,
heading: location.heading,
alpha: Orientation.singleton.gotMeasurement.data
? "" + Orientation.singleton.alpha.data
: undefined,
}
i++

20
src/Logic/Web/MangroveReviews.ts
View file

@ -55,8 +55,9 @@ export default class FeatureReviews {
private static readonly _featureReviewsCache: Record<string, FeatureReviews> = {}
public readonly subjectUri: Store<string>
public readonly average: Store<number | null>
private readonly _reviews: UIEventSource<(Review & { madeByLoggedInUser: Store<boolean> })[]> =
new UIEventSource([])
private readonly _reviews: UIEventSource<
(Review & { kid: string; signature: string; madeByLoggedInUser: Store<boolean> })[]
> = new UIEventSource([])
public readonly reviews: Store<(Review & { madeByLoggedInUser: Store<boolean> })[]> =
this._reviews
private readonly _lat: number
@ -176,11 +177,15 @@ export default class FeatureReviews {
...review,
}
const keypair: CryptoKeyPair = this._identity.keypair.data
console.log(r)
const jwt = await MangroveReviews.signReview(keypair, r)
console.log("Signed:", jwt)
const kid = await MangroveReviews.publicToPem(keypair.publicKey)
await MangroveReviews.submitReview(jwt)
this._reviews.data.push({ ...r, madeByLoggedInUser: new ImmutableStore(true) })
this._reviews.data.push({
...r,
kid,
signature: jwt,
madeByLoggedInUser: new ImmutableStore(true),
})
this._reviews.ping()
}
@ -189,7 +194,7 @@ export default class FeatureReviews {
* @param reviews
* @private
*/
private addReviews(reviews: { payload: Review; kid: string }[]) {
private addReviews(reviews: { payload: Review; kid: string; signature: string }[]) {
const self = this
const alreadyKnown = new Set(self._reviews.data.map((r) => r.rating + " " + r.opinion))
@ -199,7 +204,6 @@ export default class FeatureReviews {
try {
const url = new URL(review.sub)
console.log("URL is", url)
if (url.protocol === "geo:") {
const coordinate = <[number, number]>(
url.pathname.split(",").map((n) => Number(n))
@ -222,6 +226,8 @@ export default class FeatureReviews {
}
self._reviews.data.push({
...review,
kid: reviewData.kid,
signature: reviewData.signature,
madeByLoggedInUser: this._identity.key_id.map((user_key_id) => {
return reviewData.kid === user_key_id
}),