From 95d432338364eab58b3acb3d8df522161647a264 Mon Sep 17 00:00:00 2001
From: Takayuki Miyauchi <miya0001@users.noreply.github.com>
Date: Sun, 7 Jul 2024 15:06:07 +0900
Subject: [PATCH] added js to select styles

---
 css/admin.css                     |   3 ++-
 geolonia-open-gis.php             |  14 ++++++++++----
 js/admin.js                       |   9 ++++++++-
 languages/geolonia-open-gis-ja.mo | Bin 995 -> 1130 bytes
 languages/geolonia-open-gis-ja.po |  21 ++++++++++++++++++---
 languages/geolonia-open-gis.pot   |  20 ++++++++++++++++++--
 6 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 4b30168..94137f3 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -176,7 +176,7 @@
 {
 	width: 30%;
 	max-width: 256px;
-	border: 1px solid #0a4b78;;
+	border: 2px solid #8c8f94;
 	text-align: center;
 	position: relative;
 	margin: 0;
@@ -194,6 +194,7 @@
 #geolonia-style-data-list li.active
 {
 	opacity: 1;
+	border-color: #2271b1;
 }
 
 #geolonia-style-data-list li img
diff --git a/geolonia-open-gis.php b/geolonia-open-gis.php
index 1094ed2..4c8e86d 100644
--- a/geolonia-open-gis.php
+++ b/geolonia-open-gis.php
@@ -249,16 +249,16 @@ function() {
 		'geolonia-gis-meta-style',
 		__( 'Style', 'geolonia-open-gis' ),
 		function() {
-			$style = GEOLONIA_GIS_DEFAULT_STYLE;
+			$current_style = GEOLONIA_GIS_DEFAULT_STYLE;
 
 			if ( get_post_meta( get_the_ID(), '_geolonia-gis-style', true ) ) {
-				$style = get_post_meta( get_the_ID(), '_geolonia-gis-style', true );
+				$current_style = get_post_meta( get_the_ID(), '_geolonia-gis-style', true );
 			}
 
 			wp_nonce_field( 'geolonia-gis-nonce-style', 'geolonia-gis-nonce-style' );
 			?>
 			<div class="select-geolonia-styles">
-				<input id="geolonia-gis-style" name="geolonia-gis-style" list="styles" class="geolonia-meta" value="<?php echo esc_attr($style) ?>" autocomplete="off" />
+				<input id="geolonia-gis-style" name="geolonia-gis-style" list="styles" class="geolonia-meta" value="<?php echo esc_url($current_style) ?>" autocomplete="off" />
 				<ul id="geolonia-style-data-list">
 				<?php
 					$default_styles = apply_filters( 'geolonia-open-gis-styles', array(
@@ -279,8 +279,14 @@ function() {
 						),
 					) );
 
+
+
 					foreach ( $default_styles as $style ) {
-						echo '<li data-url="' . esc_url( $style['url'] ) . '"><img src="' . esc_url( $style['image'] ) . '"><div class="style-name">' . esc_html( $style['name'] ) . '</div></li>';
+						if ($current_style === $style['url']) {
+							echo '<li class="active" data-url="' . esc_url( $style['url'] ) . '"><img src="' . esc_url( $style['image'] ) . '"><div class="style-name">' . esc_html( $style['name'] ) . '</div></li>';
+						} else {
+							echo '<li data-url="' . esc_url( $style['url'] ) . '"><img src="' . esc_url( $style['image'] ) . '"><div class="style-name">' . esc_html( $style['name'] ) . '</div></li>';
+						}
 					}
 				?>
 				</ul>
diff --git a/js/admin.js b/js/admin.js
index 32057a3..d0fb57a 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -171,14 +171,21 @@ if (document.getElementById('geolonia-gis-editor-container')) {
 
   document.querySelectorAll('#geolonia-style-data-list li').forEach((li) => {
     li.addEventListener('click', (e) => {
+      document.querySelectorAll('#geolonia-style-data-list li').forEach((li) => {
+        li.classList.remove('active')
+      })
+      e.currentTarget.classList.add('active')
+
       const styleUrl = e.currentTarget.dataset.url
       document.getElementById('geolonia-gis-style').value = styleUrl
       map.setStyle(styleUrl)
     })
     li.addEventListener('mouseover', (e) => {
+      e.currentTarget.classList.add('hover')
+    })
+    li.addEventListener('mouseleave', (e) => {
       document.querySelectorAll('#geolonia-style-data-list li').forEach((li) => {
         li.classList.remove('hover')
-        e.currentTarget.classList.add('hover')
       })
     })
   })
diff --git a/languages/geolonia-open-gis-ja.mo b/languages/geolonia-open-gis-ja.mo
index 9b0d4862680737f7910e15c88347ddf7818efa66..be1f12222d4f95803e17fee378ca6f49d39b5319 100644
GIT binary patch
delta 420
zcmXZVy-UMD00r<%Q`=g<K&W68$!aBfi5fJc6-q%tv5S))O)16pA~CvlDGp9*P^h{n
zisB@6k%Iq$lbef+Bt_9#aPr0U;PJb6pYQR{MD1-bdO|SzkWr)_6pXKsf4edNMtYDR
zL<}N?cj7SUDX7C?n1Cy=3$DX{xB*8XhY~!1Q9^3u29rnR9tl1w;I$a6!U5>O6s&jF
z&mcv=?DQAdi~b6ypby935MEEiSs1*#3CTi*@hy3oZIg^;*=Ctb%qi}W>{^awi&n+r
zWhUo%VUpm;(XSC>++?=dRE0euomVn;kvV0HD~q^g$QspV6sjxQd|uTJl^WCf1f>S0
z?sa55xx{#Bmz8kNeU8k@?Z%UL@!*{|iPyUI?-~THeYpS8xC)ouq$r8lc4bkEVc&0^
Ix~t;xA0Ka89smFU

delta 314
zcmaFG@tD2-o)F7a1|Z-BVi_P#0b*VtUIWA+@BoOpf%qX1gT&tgu^ABm24YqqHezI8
z-~-YYKw26|y8~${Ae{`PS%7pMkZu6tW*}w*@>!S}7({_IH;^`9V5nzM1TuJl0zp7p
zA4taoX*nR>52Uq#^g197a@<WI4KxF62nUd62VxKaSpote#{iXp0Z2U)l+ECrpI?-c
znU`3STFl^{nxB)Omzk*GnU}1`;8&VES%%SUb2MWy<K*8=YLj)C&1IhMTK;UsOonF*
bRz2O*|76ds=S%h}z_d+Xz-%=6Ci6r9?2j}P

diff --git a/languages/geolonia-open-gis-ja.po b/languages/geolonia-open-gis-ja.po
index 9801636..53c1c9f 100644
--- a/languages/geolonia-open-gis-ja.po
+++ b/languages/geolonia-open-gis-ja.po
@@ -1,5 +1,3 @@
-# Copyright (C) 2024 Geolonia Inc.
-# This file is distributed under the same license as the Geolonia Open GIS plugin.
 msgid ""
 msgstr ""
 "Project-Id-Version: Geolonia Open GIS 0.1.0\n"
@@ -11,6 +9,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Creation-Date: 2024-06-29T16:10:36+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language: \n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: geolonia-open-gis\n"
 
@@ -55,6 +54,22 @@ msgstr "現在のズームレベルを使用する"
 msgid "Style"
 msgstr "スタイル"
 
-#: geolonia-open-gis.php:368
+#: geolonia-open-gis.php:395
 msgid "Number of features: <span id=\"num-of-features\"></span>"
 msgstr "地物の数: <span id=\"num-of-features\"></span>"
+
+#: geolonia-open-gis.php:266
+msgid "Standard"
+msgstr "標準"
+
+#: geolonia-open-gis.php:271
+msgid "GSI"
+msgstr "地理院地図"
+
+#: geolonia-open-gis.php:276
+msgid "Blank Map"
+msgstr "白地図"
+
+#: inc/functions.php:10
+msgid "Map"
+msgstr "地図"
diff --git a/languages/geolonia-open-gis.pot b/languages/geolonia-open-gis.pot
index 8924ca0..10ae1f0 100644
--- a/languages/geolonia-open-gis.pot
+++ b/languages/geolonia-open-gis.pot
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-06-29T16:13:37+00:00\n"
+"POT-Creation-Date: 2024-07-07T05:50:45+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: geolonia-open-gis\n"
@@ -55,6 +55,22 @@ msgstr ""
 msgid "Style"
 msgstr ""
 
-#: geolonia-open-gis.php:368
+#: geolonia-open-gis.php:266
+msgid "Standard"
+msgstr ""
+
+#: geolonia-open-gis.php:271
+msgid "GSI"
+msgstr ""
+
+#: geolonia-open-gis.php:276
+msgid "Blank Map"
+msgstr ""
+
+#: geolonia-open-gis.php:395
 msgid "Number of features: <span id=\"num-of-features\"></span>"
 msgstr ""
+
+#: inc/functions.php:10
+msgid "Map"
+msgstr ""