Merge pull request #678 from nishizoe/t-4569

(fixed #4569, BP from #4567) Google Map 小窓が正常に表示されない場合がある問題を修正
openpne · Dec 6, 2022 · af042f5 · af042f5
2 parents b30ae8a + 3ce197f
commit af042f5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
@@ -12,18 +12,20 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+m|[0-9\.]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
 
-    if (result[4]) {
+    if (param.z.indexOf('m') !== -1) {
+      param.z = 15;
       param.t = 'k';
     }
   } else {
-    var query = id.split('&amp;');
+    id.replace('&amp;', '&');
+    var query = id.split('&');
     for(i = 0; i < query.length; i++) {
       var pair = query[i].split('=');
       if (pair.length !== 2) {

diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
@@ -12,18 +12,20 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+m|[0-9\.]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
 
-    if (result[4]) {
+    if (param.z.indexOf('m') !== -1) {
+      param.z = 15;
       param.t = 'k';
     }
   } else {
-    var query = id.split('&amp;');
+    id.replace('&amp;', '&');
+    var query = id.split('&');
     for(i = 0; i < query.length; i++) {
       var pair = query[i].split('=');
       if (pair.length !== 2) {

diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
@@ -11,18 +11,20 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+m|[0-9\.]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
 
-    if (result[4]) {
+    if (param.z.indexOf('m') !== -1) {
+      param.z = 15;
       param.t = 'k';
     }
   } else {
-    var query = id.split('&amp;');
+    id.replace('&amp;', '&');
+    var query = id.split('&');
     for(i = 0; i < query.length; i++) {
       var pair = query[i].split('=');
       if (pair.length !== 2) {

diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
@@ -11,18 +11,20 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9\.]+m|[0-9\.]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
 
-    if (result[4]) {
+    if (param.z.indexOf('m') !== -1) {
+      param.z = 15;
       param.t = 'k';
     }
   } else {
-    var query = id.split('&amp;');
+    id.replace('&amp;', '&');
+    var query = id.split('&');
     for(i = 0; i < query.length; i++) {
       var pair = query[i].split('=');
       if (pair.length !== 2) {