Skip to content

Commit

Permalink
1.7
Browse files Browse the repository at this point in the history
Some fixes for old password types using different encryption.
Fixes for failure to connect successfully at times.

Add override - Disable all Communication in PluginConfig, with action Groups to enable/disable.  Enables plugin to be disabled completely and reenabled at users wish.

Add url_mapping - which will include a google maps embedded url.  Individual API Key needs access for this to be useful.  (use in Kiosk Home iFrame)

Update embed mapping
  • Loading branch information
Glenn Hawken committed Jan 7, 2025
1 parent 55feafb commit a3b41d3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion iFindFriendsMini.indigoPlugin/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>PluginVersion</key>
<string>1.7.01</string>
<string>1.7.03</string>
<key>ServerApiVersion</key>
<string>3.4</string>
<key>CFBundleDisplayName</key>
Expand Down
10 changes: 5 additions & 5 deletions iFindFriendsMini.indigoPlugin/Contents/Server Plugin/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,7 @@ def urlGenerate(self, latitude, longitude, mapAPIKey, iHorizontal, iVertical, iZ
mapLabel = dev.pluginProps.get('mapLabel','lightblue1')
# Create Map url
mapCentre = 'center=' + str(latitude) + "," + str(longitude)

embedMarker = 'q=' + str(latitude) + "," + str(longitude)
# Set size
if self.mapType=='google':
if iZoom < 0:
Expand All @@ -2083,7 +2083,7 @@ def urlGenerate(self, latitude, longitude, mapAPIKey, iHorizontal, iVertical, iZ
mapAPIKey = self.BingAPI

mapZoom = 'zoom=' + str(iZoom)

embedZoom = 'zoom=18'
mapSize = 'size=' + str(iHorizontal) + 'x' + str(iVertical)
mapFormat = 'format=jpg&maptype=hybrid'
# Use a standard marker for a GeoFence Centre
Expand All @@ -2092,16 +2092,16 @@ def urlGenerate(self, latitude, longitude, mapAPIKey, iHorizontal, iVertical, iZ
latitude) + "," + str(longitude)
mapGoogle = 'https://maps.googleapis.com/maps/api/staticmap?'

mapGoogleEmbed = 'https://www.google.com/maps/embed/v1/view?' ##key=YOUR_API_KEY&PARAMETERS'

mapGoogleEmbed = 'https://www.google.com/maps/embed/v1/place?' ##key=YOUR_API_KEY&PARAMETERS'
## https: // www.google.com / maps / embed / v1 / place?q = -53.416261800507876, 151.39133024066476 & zoom = 18
#urlmapGoogle = 'https://www.google.com/maps/@?api=1&map_action=map&center='+str(latitude)+','+str(longitude)+'&zoom='+str(iZoom)+'&basemap=satellite'
urlmapGoogle = 'comgooglemaps://maps.google.com/maps?z='+str(iZoom)+'&t=h&q=' + str(latitude) + ',' + str(longitude)
#Remove API usage altogether
customURL = mapGoogle + mapCentre + '&' + mapZoom + '&' + mapSize + '&' + mapFormat + '&' + mapMarkerGeo + '&' + mapMarkerPhone + '&key=' + mapAPIKey
self.logger.debug(u'StaticMap URL equals:'+str(customURL))
self.logger.debug(u'Map URL equals:' + str(urlmapGoogle))

googleEmbedUrl = mapGoogleEmbed + mapCentre + '&' + mapZoom + '&key=' + mapAPIKey
googleEmbedUrl = mapGoogleEmbed + embedMarker + '&' + embedZoom + '&key=' + mapAPIKey
self.logger.debug(u'Google Embed Map URL equals:' + str(googleEmbedUrl))


Expand Down

0 comments on commit a3b41d3

Please sign in to comment.