Skip to content

Add null and undefined guards #725

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

Merged
geographika merged 2 commits into from
Jun 15, 2026
Merged

Add null and undefined guards #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c289f46
Add guards for testing when map is not present
geographika Jun 15, 2026
c1ba256
Add missing requires and move markerStyle to a function
geographika Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions app/controller/button/StreetViewTool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,13 @@ Ext.define('CpsiMapview.controller.button.StreetViewTool', {
// add layer and raise layer to top of stack
me.map.addLayer(me.vectorLayer);
} else {
me.map.removeLayer(me.vectorLayer);
if (me.map) {
me.map.removeLayer(me.vectorLayer);
}
// cleanup
me.vectorLayer.getSource().clear();
if (me.vectorLayer) {
me.vectorLayer.getSource().clear();
}
if (me.streetViewWin) {
me.streetViewWin.close();
}
Expand Down Expand Up @@ -176,7 +180,9 @@ Ext.define('CpsiMapview.controller.button.StreetViewTool', {
if (activate) {
me.map.on('singleclick', me.onMapClick);
} else {
me.map.un('singleclick', me.onMapClick);
if (me.map) {
me.map.un('singleclick', me.onMapClick);
}
}
},

Expand Down Expand Up @@ -472,7 +478,9 @@ Ext.define('CpsiMapview.controller.button.StreetViewTool', {
*/
unregisterGmapsEvents: function () {
const me = this;
google.maps.event.removeListener(me.svPovChangedListener);
google.maps.event.removeListener(me.svPositionChangedListener);
if (typeof google !== 'undefined') {
google.maps.event.removeListener(me.svPovChangedListener);
google.maps.event.removeListener(me.svPositionChangedListener);
}
}
});
5 changes: 4 additions & 1 deletion app/view/toolbar/MapFooter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Ext.define('CpsiMapview.view.toolbar.MapFooter', {
'BasiGX.view.panel.CoordinateMousePositionPanel',
'CpsiMapview.view.button.LoginButton',
'CpsiMapview.view.button.MinimizeAllButton',
'CpsiMapview.view.panel.NumericAttributeSlider',
'CpsiMapview.util.Style'
],

Expand All @@ -24,7 +25,9 @@ Ext.define('CpsiMapview.view.toolbar.MapFooter', {
{
xtype: 'basigx-panel-coordinatemouseposition',
showMarker: true,
markerStyle: CpsiMapview.util.Style.createRedPoiMarker(),
markerStyle: function () {
return CpsiMapview.util.Style.createRedPoiMarker();
},
epsgCodeArray: ['EPSG:4326', 'EPSG:29902', 'EPSG:2157'],
activeEpsgCode: 'EPSG:29902',
segmentedButtonLimit: 3
Expand Down
Loading