Compare commits

..

No commits in common. "master" and "v1.0.1" have entirely different histories.

10 changed files with 307 additions and 572 deletions

View file

@ -1,8 +1,6 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "2.1.0" kotlin("jvm") version "1.8.10"
kotlin("plugin.allopen") version "1.8.10"
id("io.quarkus") id("io.quarkus")
} }
@ -17,30 +15,31 @@ val quarkusPlatformVersion: String by project
dependencies { dependencies {
implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")) implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
implementation("io.quarkus:quarkus-rest-qute") implementation("io.quarkus:quarkus-resteasy-reactive-qute")
implementation("io.quarkus:quarkus-kotlin") implementation("io.quarkus:quarkus-kotlin")
implementation("org.jetbrains.kotlin:kotlin-stdlib") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("io.quarkus:quarkus-arc") implementation("io.quarkus:quarkus-arc")
testImplementation("io.quarkus:quarkus-junit5") testImplementation("io.quarkus:quarkus-junit5")
} }
group = "fr.spacefox" group = "fr.spacefox"
version = "1.0.7" version = "1.0.1"
java { java {
sourceCompatibility = JavaVersion.VERSION_21 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_17
} }
tasks.withType<Test> { tasks.withType<Test> {
systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager") 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
} }

View file

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

Binary file not shown.

View file

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

38
gradlew vendored
View file

@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -57,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (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 # https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -82,12 +80,13 @@ do
esac esac
done done
# This is normally unused APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# shellcheck disable=SC2034
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
' "$PWD" ) || exit DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -134,29 +133,22 @@ location of your Java installation."
fi fi
else 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 Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
case $MAX_FD in #( case $MAX_FD in #(
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -201,15 +193,11 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Collect all arguments for the java command;
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# Collect all arguments for the java command: # * put everything else in single quotes, so that it's not re-expanded.
# * 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 -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

23
gradlew.bat vendored
View file

@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@ -28,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -45,11 +42,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
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 goto fail
@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
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 goto fail

View file

@ -5,22 +5,26 @@ import fr.spacefox.japon.data.Page
import fr.spacefox.japon.data.Place import fr.spacefox.japon.data.Place
import io.quarkus.qute.Template import io.quarkus.qute.Template
import io.quarkus.qute.TemplateInstance 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("/") @Path("/")
class ListHtmlResource(val list: Template) { 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 @GET
@Path("accueil") @Path("accueil")
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
fun accueil(): TemplateInstance = fun accueil(): TemplateInstance =
list.data("title", "Accueil").data("pages", Page.entries.toTypedArray()).withMenuData() list.data("title", "Accueil").data("pages", Page.values()).withMenuData()
@GET @GET
@Path("category/{name}") @Path("category/{name}")
@ -79,6 +83,5 @@ class LicencesResource(val licences: Template) {
} }
private fun TemplateInstance.withMenuData(): TemplateInstance { 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())
} }

View file

@ -11,7 +11,7 @@ enum class Category(val displayName: String) {
quotidien("Vie quotidienne"), quotidien("Vie quotidienne"),
francisla("Francis-La"); 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() } fun imgCount(): Int = pages().sumOf { it.imgCount() }
} }

File diff suppressed because it is too large Load diff

View file

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