forked from MapComplete/MapComplete
Add small script to steal shop presets from the iD-project
This commit is contained in:
parent
5cf52690ee
commit
ef66b1931f
5 changed files with 4037 additions and 166 deletions
|
|
@ -181,7 +181,7 @@ export default class TagRenderingQuestion extends Combine {
|
|||
}
|
||||
|
||||
|
||||
if (applicableMappings.length < 8 || configuration.multiAnswer || hasImages || ifNotsPresent) {
|
||||
if (applicableMappings.length < 8 || configuration.multiAnswer || (hasImages && applicableMappings.length < 16) || ifNotsPresent) {
|
||||
inputEls = (applicableMappings ?? []).map((mapping, i) => TagRenderingQuestion.GenerateMappingElement(state, tagsSource, mapping, allIfNotsExcept(i)));
|
||||
inputEls = Utils.NoNull(inputEls);
|
||||
} else {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -51,7 +51,8 @@
|
|||
"weblate-fix": "git remote update weblate-github ; git merge weblate-github/weblate-mapcomplete-core; git merge weblate-github/weblate-mapcomplete-layers ; git merge weblate-github/weblate-mapcomplete-layer-translations",
|
||||
"weblate-fix-heavy": "git remote rm weblate-layers; git remote add weblate-layers https://hosted.weblate.org/git/mapcomplete/layers/; git remote update weblate-layers; git merge weblate-layers/master",
|
||||
"housekeeping": "npm run generate && npm run generate:docs && npm run generate:contributor-list && git add Docs/* && git commit assets/ langs/ Docs/ -m 'Housekeeping...'",
|
||||
"parseSchools": "ts-node scripts/schools/amendSchoolData.ts"
|
||||
"parseSchools": "ts-node scripts/schools/amendSchoolData.ts",
|
||||
"steal": "ts-node scripts/readIdPresets.ts"
|
||||
},
|
||||
"keywords": [
|
||||
"OpenStreetMap",
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@ class TranslationPart {
|
|||
|
||||
contents: Map<string, TranslationPart | string> = new Map<string, TranslationPart | string>()
|
||||
|
||||
static fromDirectory(path): TranslationPart {
|
||||
const files = ScriptUtils.readDirRecSync(path, 1).filter(file => file.endsWith(".json"))
|
||||
const rootTranslation = new TranslationPart()
|
||||
for (const file of files) {
|
||||
const content = JSON.parse(readFileSync(file, "UTF8"))
|
||||
rootTranslation.addTranslation(file.substr(0, file.length - ".json".length), content)
|
||||
}
|
||||
return rootTranslation
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a leaf object
|
||||
* @param language
|
||||
|
|
@ -59,11 +69,31 @@ class TranslationPart {
|
|||
return;
|
||||
}
|
||||
|
||||
let dontTranslateKeys: string[] = undefined
|
||||
{
|
||||
const noTranslate = <string | string[]>object["#dont-translate"]
|
||||
|
||||
if (noTranslate === "*") {
|
||||
console.log("Ignoring translations for " + context)
|
||||
return
|
||||
} else if (typeof noTranslate === "string") {
|
||||
dontTranslateKeys = [noTranslate]
|
||||
} else {
|
||||
dontTranslateKeys = noTranslate
|
||||
}
|
||||
if (noTranslate !== undefined) {
|
||||
console.log("Ignoring some translations for " + context + ": " + dontTranslateKeys.join(", "))
|
||||
}
|
||||
}
|
||||
|
||||
for (let key in object) {
|
||||
if (!object.hasOwnProperty(key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dontTranslateKeys?.indexOf(key) >= 0) {
|
||||
continue
|
||||
}
|
||||
const v = object[key]
|
||||
|
||||
if (v == null) {
|
||||
|
|
@ -145,39 +175,6 @@ class TranslationPart {
|
|||
return `{${parts.join(",")}}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively adds a translation object, the inverse of 'toJson'
|
||||
* @param language
|
||||
* @param object
|
||||
* @private
|
||||
*/
|
||||
private addTranslation(language: string, object: any){
|
||||
for (const key in object) {
|
||||
const v = object[key]
|
||||
let subpart = <TranslationPart>this.contents.get(key)
|
||||
if(subpart === undefined){
|
||||
subpart = new TranslationPart()
|
||||
this.contents.set(key, subpart)
|
||||
}
|
||||
if(typeof v === "string"){
|
||||
subpart.contents.set(language, v)
|
||||
}else{
|
||||
subpart.addTranslation(language, v)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static fromDirectory(path): TranslationPart{
|
||||
const files = ScriptUtils.readDirRecSync(path, 1).filter(file => file.endsWith(".json"))
|
||||
const rootTranslation = new TranslationPart()
|
||||
for (const file of files) {
|
||||
const content = JSON.parse(readFileSync(file, "UTF8"))
|
||||
rootTranslation.addTranslation(file.substr(0, file.length - ".json".length), content)
|
||||
}
|
||||
return rootTranslation
|
||||
}
|
||||
|
||||
validateStrict(ctx?: string): void {
|
||||
const errors = this.validate()
|
||||
for (const err of errors) {
|
||||
|
|
@ -264,6 +261,29 @@ class TranslationPart {
|
|||
return errors
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively adds a translation object, the inverse of 'toJson'
|
||||
* @param language
|
||||
* @param object
|
||||
* @private
|
||||
*/
|
||||
private addTranslation(language: string, object: any) {
|
||||
for (const key in object) {
|
||||
const v = object[key]
|
||||
let subpart = <TranslationPart>this.contents.get(key)
|
||||
if (subpart === undefined) {
|
||||
subpart = new TranslationPart()
|
||||
this.contents.set(key, subpart)
|
||||
}
|
||||
if (typeof v === "string") {
|
||||
subpart.contents.set(language, v)
|
||||
} else {
|
||||
subpart.addTranslation(language, v)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
203
scripts/readIdPresets.ts
Normal file
203
scripts/readIdPresets.ts
Normal file
|
|
@ -0,0 +1,203 @@
|
|||
/***
|
||||
* Parses presets from the iD repository and extracts some usefull tags from them
|
||||
*/
|
||||
import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
|
||||
import ScriptUtils from "./ScriptUtils";
|
||||
import {existsSync, readFileSync, writeFileSync} from "fs";
|
||||
import {TagsFilter} from "../Logic/Tags/TagsFilter";
|
||||
import * as known_languages from "../assets/language_native.json"
|
||||
import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
|
||||
import {QuestionableTagRenderingConfigJson} from "../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson";
|
||||
import SmallLicense from "../Models/smallLicense";
|
||||
import {icon} from "leaflet";
|
||||
|
||||
interface IconThief {
|
||||
steal(iconName: string): boolean
|
||||
}
|
||||
|
||||
interface IdPreset {
|
||||
icon: string,
|
||||
geometry: ("point" | "line" | "area")[]
|
||||
/**
|
||||
* Extra search terms
|
||||
*/
|
||||
terms: string []
|
||||
tags: Record<string, string>
|
||||
name: string,
|
||||
searchable?: false,
|
||||
}
|
||||
|
||||
class MakiThief implements IconThief{
|
||||
private readonly _directory: string;
|
||||
private readonly _targetDir: string;
|
||||
|
||||
constructor(directory: string, targetDir: string) {
|
||||
this._directory = directory;
|
||||
this._targetDir = targetDir;
|
||||
}
|
||||
|
||||
public steal(iconName: string): boolean{
|
||||
const target = this._targetDir+iconName+".svg"
|
||||
if(existsSync(target)){
|
||||
// return true
|
||||
}
|
||||
const file = readFileSync(this._directory+"/icons/"+iconName+".svg", "utf8")
|
||||
writeFileSync(target, file,'utf8')
|
||||
writeFileSync(target+".license_info.json",
|
||||
JSON.stringify(<SmallLicense>{
|
||||
authors:['Maki icon set'],
|
||||
license: 'CC0',
|
||||
path: 'maki-'+iconName+".svg",
|
||||
sources: ["https://github.com/mapbox/maki"]
|
||||
}), 'utf8')
|
||||
console.log("Successfully stolen "+iconName)
|
||||
return true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class AggregateIconThief implements IconThief{
|
||||
private readonly _maki: MakiThief;
|
||||
|
||||
constructor(maki: MakiThief) {
|
||||
this._maki = maki;
|
||||
}
|
||||
|
||||
|
||||
public steal(iconName: string): boolean{
|
||||
if(iconName.startsWith('maki-')){
|
||||
this._maki.steal(iconName.substr('maki-'.length))
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class IdThief {
|
||||
private readonly _idPresetsRepository: string;
|
||||
|
||||
private readonly _tranlationFiles: Record<string, object> = {}
|
||||
private readonly _knownLanguages: string[]
|
||||
private readonly _iconThief: IconThief;
|
||||
|
||||
public constructor(idPresetsRepository: string, iconThief: IconThief) {
|
||||
this._idPresetsRepository = idPresetsRepository;
|
||||
this._iconThief = iconThief;
|
||||
const knownById = ScriptUtils.readDirRecSync(`${this._idPresetsRepository}/dist/translations/`)
|
||||
.map(pth => pth.substring(pth.lastIndexOf('/') + 1, pth.length - '.json'.length))
|
||||
.filter(lng => !lng.endsWith('.min'));
|
||||
const missing = Object.keys(known_languages).filter(lng => knownById.indexOf(lng.replace('-','_')) < 0)
|
||||
this._knownLanguages = knownById.filter(lng => known_languages[lng] !== undefined)
|
||||
console.log("Id knows following languages:", this._knownLanguages.join(", "), "missing:", missing)
|
||||
}
|
||||
|
||||
public getTranslation(language: string, ...path: string[]) {
|
||||
let obj = this.loadTranslationFile(language)[language]
|
||||
for (const p of path) {
|
||||
obj = obj[p]
|
||||
if (obj === undefined) {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
return obj
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a tagRenderingConfigJson for the 'shop' theme
|
||||
*/
|
||||
public readShopPresets(): {if, then, hideInAnswer?: string | boolean}[] {
|
||||
|
||||
const dir = this._idPresetsRepository + "/data/presets/shop"
|
||||
|
||||
const mappings:
|
||||
{
|
||||
if: string | {and: string[]},
|
||||
then: Record<string, string>,
|
||||
hideInAnswer?: string | boolean
|
||||
icon?: {
|
||||
|
||||
path: string,
|
||||
/**
|
||||
* Size of the image
|
||||
*/
|
||||
class: "small" | "medium" | "large" | string
|
||||
}
|
||||
}[] = []
|
||||
const files = ScriptUtils.readDirRecSync(dir, 1);
|
||||
for (const file of files) {
|
||||
const name = file.substring(file.lastIndexOf('/')+1, file.length - '.json'.length)
|
||||
const preset = <IdPreset>JSON.parse(readFileSync(file, 'utf8'))
|
||||
|
||||
if(preset.searchable === false){
|
||||
continue
|
||||
}
|
||||
|
||||
console.log(` ${name} (shop=${preset.tags["shop"]}), ${preset.icon}` )
|
||||
|
||||
const thenClause : Record<string, string> = {
|
||||
en: preset.name
|
||||
}
|
||||
for (const lng of this._knownLanguages) {
|
||||
const tr = this.getTranslation(lng, "presets", "presets", "shop/"+name, "name")
|
||||
if(tr === undefined){
|
||||
continue
|
||||
}
|
||||
thenClause[lng.replace('-','_')] = tr
|
||||
}
|
||||
|
||||
let tag : string | {and: string[]}
|
||||
const tagKeys = Object.keys(preset.tags)
|
||||
if(tagKeys.length === 1){
|
||||
tag = tagKeys[0]+"="+preset.tags[tagKeys[0]]
|
||||
}else{
|
||||
tag = {
|
||||
and: tagKeys.map(key => key+"="+preset.tags[key])
|
||||
}
|
||||
}
|
||||
const mapping = {
|
||||
if: tag,
|
||||
then: thenClause
|
||||
}
|
||||
if(preset.tags["shop"] == "yes"){
|
||||
mapping["hideInAnswer"] = true
|
||||
mapping.if["en"] = "Unspecified shop"
|
||||
}
|
||||
|
||||
if(this._iconThief.steal(preset.icon)){
|
||||
mapping["icon"] = {
|
||||
path: "./assets/layers/shops/"+preset.icon+".svg",
|
||||
size: "medium"
|
||||
}
|
||||
}
|
||||
|
||||
mappings.push(mapping)
|
||||
|
||||
}
|
||||
|
||||
return mappings
|
||||
}
|
||||
|
||||
private loadTranslationFile(language: string): object {
|
||||
const cached = this._tranlationFiles[language]
|
||||
if (cached) {
|
||||
return cached
|
||||
}
|
||||
return this._tranlationFiles[language] = JSON.parse(readFileSync(`${this._idPresetsRepository}/dist/translations/${language}.json`, 'utf8'))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const targetDir = "./assets/layers/shops/"
|
||||
const iconThief = new AggregateIconThief(
|
||||
new MakiThief('../maki', targetDir+"maki-")
|
||||
)
|
||||
|
||||
const shopOptions = new IdThief("../id-tagging-schema/",iconThief ).readShopPresets()
|
||||
|
||||
const shopLayerPath =targetDir+"shops.json"
|
||||
const shopLayer = <LayerConfigJson> JSON.parse(readFileSync(shopLayerPath,'utf8'))
|
||||
const type = <QuestionableTagRenderingConfigJson> shopLayer.tagRenderings.find(tr => tr["id"] == "shops-type-from-id")
|
||||
type.mappings = shopOptions
|
||||
writeFileSync(shopLayerPath, JSON.stringify(shopLayer, null, " "),'utf8')
|
||||
Loading…
Add table
Add a link
Reference in a new issue