Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(fixed #4569, BP from #4567) Google Map 小窓が正常に表示されない場合がある問題を修正 #678

Merged
merged 1 commit into from
Dec 6, 2022
Merged

(fixed #4569, BP from #4567) Google Map 小窓が正常に表示されない場合がある問題を修正 #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions web/cmd/maps.google.co.jp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('&');
id.replace('&', '&');
var query = id.split('&');
for(i = 0; i < query.length; i++) {
var pair = query[i].split('=');
if (pair.length !== 2) {
Expand Down
8 changes: 5 additions & 3 deletions web/cmd/maps.google.com.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 5 additions & 3 deletions web/cmd/www.google.co.jp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 5 additions & 3 deletions web/cmd/www.google.com.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down