build.gradle.kts

@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    kotlin("jvm") version "2.1.0"
+    kotlin("jvm") version "1.8.0"
+    kotlin("plugin.allopen") version "1.8.0"
     id("io.quarkus")
 }
 
@@ -17,30 +15,31 @@ val quarkusPlatformVersion: String by project
 
 dependencies {
     implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
-    implementation("io.quarkus:quarkus-rest-qute")
+    implementation("io.quarkus:quarkus-resteasy-reactive-qute")
     implementation("io.quarkus:quarkus-kotlin")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("io.quarkus:quarkus-arc")
     testImplementation("io.quarkus:quarkus-junit5")
 }
 
 group = "fr.spacefox"
-version = "1.0.7"
+version = "1.0.0"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType<Test> {
     systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager")
 }
-
+allOpen {
-tasks.withType<KotlinCompile> {
+    annotation("javax.ws.rs.Path")
-    compilerOptions {
+    annotation("javax.enterprise.context.ApplicationScoped")
-        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+    annotation("io.quarkus.test.junit.QuarkusTest")
-        compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+}
-        // For Qute templates to work
+
-        compilerOptions.javaParameters = true
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    }
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlinOptions.javaParameters = true
 }

gradle.properties

@@ -1,6 +1,6 @@
 #Gradle properties
 quarkusPluginId=io.quarkus
-quarkusPluginVersion=3.15.3
+quarkusPluginVersion=2.16.0.Final
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=3.15.3
+quarkusPlatformVersion=2.16.0.Final

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,104 +15,69 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
+APP_NAME="Gradle"
-# shellcheck disable=SC2034
+APP_BASE_NAME=`basename "$0"`
-APP_BASE_NAME=${0##*/}
+
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -122,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -133,120 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-        # shellcheck disable=SC2039,SC3045
+            MAX_FD="$MAX_FD_LIMIT"
-        MAX_FD=$( ulimit -H -n ) ||
+        fi
-            warn "Could not query maximum file descriptor limit"
+        ulimit -n $MAX_FD
-    esac
+        if [ $? -ne 0 ] ; then
-    case $MAX_FD in  #(
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-      '' | soft) :;; #(
+        fi
-      *)
+    else
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-        # shellcheck disable=SC2039,SC3045
+    fi
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    # We build the pattern for arguments to be converted via cygpath
-
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    SEP=""
-    for arg do
+    for dir in $ROOTDIRSRAW ; do
-        if
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-            case $arg in                                #(
+        SEP="|"
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Collect all arguments for the java command, following the shell quoting and substitution rules
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,10 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -57,16 +54,31 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
@@ -74,19 +86,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+exit /b 1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/fr/spacefox/japon/Resource.kt

@@ -5,22 +5,26 @@ import fr.spacefox.japon.data.Page
 import fr.spacefox.japon.data.Place
 import io.quarkus.qute.Template
 import io.quarkus.qute.TemplateInstance
-import jakarta.ws.rs.GET
+import javax.ws.rs.GET
-import jakarta.ws.rs.Path
+import javax.ws.rs.Path
-import jakarta.ws.rs.PathParam
+import javax.ws.rs.PathParam
-import jakarta.ws.rs.Produces
+import javax.ws.rs.Produces
-import jakarta.ws.rs.core.MediaType
+import javax.ws.rs.core.MediaType
 
 @Path("/")
 class ListHtmlResource(val list: Template) {
 
-    @GET @Path("") @Produces(MediaType.TEXT_HTML) fun root(): TemplateInstance = accueil()
+
+    @GET
+    @Path("")
+    @Produces(MediaType.TEXT_HTML)
+    fun root(): TemplateInstance = accueil()
 
     @GET
     @Path("accueil")
     @Produces(MediaType.TEXT_HTML)
     fun accueil(): TemplateInstance =
-        list.data("title", "Accueil").data("pages", Page.entries.toTypedArray()).withMenuData()
+        list.data("title", "Accueil").data("pages", Page.values()).withMenuData()
 
     @GET
     @Path("category/{name}")
@@ -79,6 +83,5 @@ class LicencesResource(val licences: Template) {
 }
 
 private fun TemplateInstance.withMenuData(): TemplateInstance {
-    return this.data("categories", Category.entries.toTypedArray())
+    return this.data("categories", Category.values()).data("places", Place.values())
-        .data("places", Place.entries.toTypedArray())
 }

src/main/kotlin/fr/spacefox/japon/data/Category.kt

@@ -11,7 +11,7 @@ enum class Category(val displayName: String) {
     quotidien("Vie quotidienne"),
     francisla("Francis-La");
 
-    fun pages(): List<Page> = Page.entries.filter { it.category == this }
+    fun pages(): List<Page> = Page.values().filter { it.category == this }
 
     fun imgCount(): Int = pages().sumOf { it.imgCount() }
 }

src/main/kotlin/fr/spacefox/japon/data/Place.kt

@@ -6,67 +6,58 @@ enum class Place(val displayName: String, val iframeSrc: String, val link: Strin
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6"
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=nagano&sll=36.177791,137.80426&sspn=1.877743,4.22699&ie=UTF8&hq=&hnear=Nagano,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.405074,139.855957&spn=6.979889,16.501465&z=6"),
-    ),
     matsumoto(
         displayName = "Matsumoto",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6"
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&aq=0&oq=matsumot&sll=37.0625,-95.677068&sspn=107.090143,270.527344&ie=UTF8&hq=&hnear=Matsumoto,+Pr%C3%A9fecture+de+Nagano,+Japon&t=p&ll=37.125286,138.22998&spn=7.005806,16.45752&z=6"),
-    ),
     himeji(
         displayName = "Himeji",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7"
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&aq=0&oq=himeji&sll=36.253133,138.850708&sspn=3.751586,8.453979&ie=UTF8&hq=&hnear=Himeji,+Pr%C3%A9fecture+de+Hy%C5%8Dgo,+Japon&t=p&ll=35.173808,135.834961&spn=3.59183,8.22876&z=7"),
-    ),
     beppu(
         displayName = "Beppu",
         iframeSrc =
             "https://www.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A&output=embed",
         link =
-            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A"
+            "https://www.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&aq=0&oq=Beppu&sll=34.678394,134.351807&sspn=3.825721,8.453979&t=p&ie=UTF8&hq=&hnear=Beppu,+Pr%C3%A9fecture+d\'%C5%8Cita,+Japon&ll=33.28462,131.495361&spn=3.673271,8.22876&z=7&iwloc=A"),
-    ),
     hiroshima(
         displayName = "Hiroshima",
         iframeSrc =
             "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&output=embed",
         link =
-            "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&source=embed"
+            "https://www.google.com/maps?sll=37.06250000000001,-95.67706800000002&sspn=76.93536935117227,102.44083790758059&t=p&q=hiroshima&dg=opt&ie=UTF8&hq=&hnear=Hiroshima,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.134542,132.890625&spn=3.637121,8.22876&z=7&iwloc=A&source=embed"),
-    ),
     itsukushima(
         displayName = "Itsukushima (Miyajima)",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11"
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&aq=0&oq=Itsukushima&sll=37.0625,-95.677068&sspn=58.72842,107.841797&t=p&ie=UTF8&hq=Itsukushima-jinja,+Hatsukaichi,+Pr%C3%A9fecture+de+Hiroshima,+Japon&ll=34.307711,132.409973&spn=0.226874,0.514297&z=11"),
-    ),
     kyoto(
         displayName = "Kyôto",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6"
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=kyoto&aq=&sll=37.0625,-95.677068&sspn=61.452931,107.841797&ie=UTF8&hq=&hnear=Kyoto,+Pr%C3%A9fecture+de+Kyoto,+Japon&t=p&ll=35.012002,135.966797&spn=7.196108,16.45752&z=6"),
-    ),
     nara(
         displayName = "Nara",
         iframeSrc =
             "https://maps.google.com/maps?f=q&source=s_q&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7&output=embed",
         link =
-            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7"
+            "https://maps.google.com/maps?f=q&source=embed&hl=fr&geocode=&q=nara&t=p&ie=UTF8&hq=&hnear=Nara,+Pr%C3%A9fecture+de+Nara,+Japon&ll=34.669359,135.681152&spn=3.613962,8.22876&z=7"),
-    ),
     tokyo(
         displayName = "Tôkyô",
         iframeSrc =
             "https://maps.google.fr/maps?f=q&source=s_q&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6&output=embed",
         link =
-            "https://maps.google.fr/maps?f=q&source=embed&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6"
+            "https://maps.google.fr/maps?f=q&source=embed&hl=fr&geocode=&q=tokyo&aq=&sll=48.680792,2.502588&sspn=3.315151,8.453979&ie=UTF8&hq=&hnear=Tokyo,+Japon&t=p&ll=35.817813,139.658203&spn=7.124687,16.45752&z=6"),
-    ),
     ;
 
-    fun pages(): List<Page> = Page.entries.filter { it.place == this }
+    fun pages(): List<Page> = Page.values().filter { it.place == this }
 
     fun imgCount(): Int = pages().sumOf { it.imgCount() }
 }