FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Center on active flights #605 (#606)

Browse Source
This commit is contained in:
Nabeel S
2020-03-01 12:41:09 -05:00
committed by GitHub
parent a040e288de
commit 21e2e48a6e
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/admin/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/assets/admin/js/app.js.map
View File

File diff suppressed because one or more lines are too long

2
public/assets/frontend/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/assets/frontend/js/app.js.map
View File

File diff suppressed because one or more lines are too long

8
public/mix-manifest.json
View File

@@ -1,12 +1,12 @@
{ {
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=20a3fc41496724225911", "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=eb87a2cb528b13163acf",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=20b82d8dbacf7e058df2", "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=20b82d8dbacf7e058df2",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901", "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=9f24c5e6612e74065901",
"/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=21a79e99fabbd500ce1e", "/assets/frontend/js/app.js.map": "/assets/frontend/js/app.js.map?id=fd10e979227f3098bc56",
"/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=fdc4f42ad9047d073145", "/assets/frontend/css/now-ui-kit.css.map": "/assets/frontend/css/now-ui-kit.css.map?id=fdc4f42ad9047d073145",
"/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c", "/assets/admin/css/vendor.min.css.map": "/assets/admin/css/vendor.min.css.map?id=c266c31652dea865307c",
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=90ea993afba8021dbfbb", "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=dc79304820883b153382",
"/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=6e760b29df4e40c4ca92", "/assets/admin/js/app.js.map": "/assets/admin/js/app.js.map?id=6c06103ab4e281c3f4f8",
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=aa8661200da32787441c", "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=aa8661200da32787441c",
"/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=459e5951832843d174e1", "/assets/installer/js/app.js.map": "/assets/installer/js/app.js.map?id=459e5951832843d174e1",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56", "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=349344e92fb16221dd56",

2
resources/js/maps/config.js
View File

@@ -1,3 +1,3 @@
export const PLAN_ROUTE_COLOR = '#d9ed53'; export const PLAN_ROUTE_COLOR = '#8B008B';
export const ACTUAL_ROUTE_COLOR = '#067ec1'; export const ACTUAL_ROUTE_COLOR = '#067ec1';
export const CIRCLE_COLOR = '#056093'; export const CIRCLE_COLOR = '#056093';

14
resources/js/maps/live_map.js
View File

@@ -41,7 +41,7 @@ export default (_opts) => {
* @type {{}} * @type {{}}
*/ */
const markers_list = {}; const markers_list = {};
let pannedToCenter = false; let pannedToFlight = false;
let layerFlights = null; let layerFlights = null;
let layerSelFlight = null; let layerSelFlight = null;
let layerSelFlightFeature = null; let layerSelFlightFeature = null;
@@ -76,13 +76,13 @@ export default (_opts) => {
layerSelFlightLayer = layer; layerSelFlightLayer = layer;
// Center on it, but only do it once, in case the map is moved // Center on it, but only do it once, in case the map is moved
if (!pannedToCenter) { if (!pannedToFlight) {
map.panTo({ map.panTo({
lat: route.position.lat, lat: route.position.lat,
lng: route.position.lon, lng: route.position.lon,
}); });
pannedToCenter = true; pannedToFlight = true;
} }
} }
@@ -156,7 +156,7 @@ export default (_opts) => {
layer.on({ layer.on({
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
click: (e) => { click: (e) => {
pannedToCenter = false; pannedToFlight = false;
liveMapController.controller.onFlightClick(feature, layer); liveMapController.controller.onFlightClick(feature, layer);
}, },
}); });
@@ -183,6 +183,12 @@ export default (_opts) => {
// Reload the clicked-flight information // Reload the clicked-flight information
if (layerSelFlight !== null) { if (layerSelFlight !== null) {
liveMapController.controller.onFlightClick(layerSelFlightFeature, layerSelFlightLayer); liveMapController.controller.onFlightClick(layerSelFlightFeature, layerSelFlightLayer);
} else {
// Center on active flights
// eslint-disable-next-line no-lonely-if
if (!pannedToFlight) {
map.panTo(layerFlights.getBounds().getCenter());
}
} }
}); });
}; };