From e6009af9042bd762406efa436d23aad22128efdd Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@gmail.com>
Date: Sun, 25 Oct 2020 17:26:15 +0100
Subject: [PATCH] Update wikiIndex to new format

---
 Logic/PersonalLayout.ts                      |  2 +-
 assets/themes/cyclestreets/cyclestreets.json |  2 +-
 createLayouts.ts                             | 48 ++++++++------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/Logic/PersonalLayout.ts b/Logic/PersonalLayout.ts
index ed871d75a6..70d057ff2a 100644
--- a/Logic/PersonalLayout.ts
+++ b/Logic/PersonalLayout.ts
@@ -16,7 +16,7 @@ export class PersonalLayout extends Layout {
             0,
             Translations.t.favourite.description,
         );
-
+        this.maintainer = "MapComplete"
         this.description = "The personal theme allows to select one or more layers from all the layouts, creating a truly personal editor"
         this.icon = "./assets/add.svg"
     }
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 813c979453..dc8b2e66b7 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -17,7 +17,7 @@
   "startLat": 51.2095,
   "startZoom": 14,
   "startLon": 3.2228,
-  "maintainer": "MapComlete",
+  "maintainer": "MapComplete",
   "widenfactor": 0.05,
   "roamingRenderings": [
     {
diff --git a/createLayouts.ts b/createLayouts.ts
index 4bd7f59b0f..1b0ae63ae6 100644
--- a/createLayouts.ts
+++ b/createLayouts.ts
@@ -81,34 +81,19 @@ function generateWikiEntry(layout: Layout){
     if(layout.hideFromOverview){
         return "";
     }
-    let image = "MapComplete_Screenshot.png";
-    if(layout.socialImage){
-    //    image = layout.socialImage;
+    const languages = layout.supportedLanguages.map(ln => `{{#language:${ln}|en}}`).join(", ")
+    let auth = "Yes";
+    if(layout.maintainer !== "" && layout.maintainer !== "MapComplete"){
+        auth=`Yes, by ${layout.maintainer};`
     }
-    
-    
-    if(!image.startsWith("http")){
-   //     image = "https://pietervdvn.github.io/MapComplete/"+image
-    }
-    
-   return `{{Software
-|name           = ${layout.id}
-|author         = ${layout.maintainer ?? "MapComplete builtin"}
-|web            = https://pietervdvn.github.io/MapComplete/${layout.id}.html
-|repo           = https://github.com/pietervdvn/MapComplete
-|platform       = web
-|code           = Typescript;HTML;CSS
-|languages      = ${layout.supportedLanguages.join(";")}
-|genre          = display;editor
-|screenshot     = ${image}
-|description    = A MapComplete theme: ${Translations.W(layout.description)?.InnerRender() ?? ""}
-|map        = yes
-|findLocation            = yes
-|findNearbyPOI           = yes
-|addPOI          = yes
-|editPOI         = yes
-|editTags        = yes
-|
+   return `{{service_item
+|name= [https://pietervdvn.github.io/MapComplete/${layout.id}.html ${layout.id}]
+|region= Worldwide
+|lang= ${languages}
+|descr= A MapComplete theme: ${Translations.W(layout.description).InnerRender()}
+|material= {{yes|[https://github.com/pietervdvn/MapComplete ${auth}]}}
+|image= MapComplete_Screenshot.png
+|genre= POI, editor, ${layout.id}
 }}`
 }
 
@@ -240,7 +225,9 @@ function createLandingPage(layout: Layout) {
 const blacklist = ["", "test", ".", "..", "manifest", "index", "land", "preferences", "account", "openstreetmap"]
 const all = AllKnownLayouts.allSets;
 
-let wikiPage = "";
+let wikiPage = "{|class=\"wikitable sortable\"\n" +
+    "! Name, link !! Genre !! Covered region !! Language !! Description !! Free materials !! Image\n" +
+    "|-";
 
 for (const layoutName in all) {
     if (blacklist.indexOf(layoutName.toLowerCase()) >= 0) {
@@ -262,8 +249,11 @@ for (const layoutName in all) {
     const landing = createLandingPage(layout);
     writeFile(enc(layout.id) + ".html", landing, err)
     
-    wikiPage += "\n\n"+generateWikiEntry(layout);
+    wikiPage += "\n"+generateWikiEntry(layout);
 }
+
+wikiPage += "|}"
+
 writeFile("./assets/generated/wikiIndex", wikiPage, (err) => {
     if (err !== null) {
         console.log("Could not save wikiindex", err);