Small bug fixes.

http://forum.openstreetmap.org/viewtopic.php?pid=369485#p369485
and suncalc

opening_hours_map.html

@@ -33,13 +33,13 @@
 // from https://github.com/rurseekatze/OpenLinkMap/blob/master/js/small.js
 function editPopupContent(content, lat, lon, type, id)
 {
-	var type = type.substr(0, 1);
+	var short_type = type.substr(0, 1);
 	// add some links to the bottom of a popup
 	content += '<br />';
-	content += '<a href="http://www.openstreetmap.org/edit?editor=id&'+type+'='+id+'" target="_blank">iD</a>&nbsp;&nbsp;';
+	content += '<a href="http://www.openstreetmap.org/edit?editor=id&'+short_type+'='+id+'" target="_blank">iD</a>&nbsp;&nbsp;';
 	content +=
-		'<a href="http://www.openstreetmap.org/edit?'+type+'='+id+'&editor=potlatch2" target="_blank">Potlatch</a>'+
-		'&nbsp;&nbsp;<a href="http://localhost:8111/load_object?objects='+ type+id+'&select='+type+id+'" target="josm" onclick="return josm(this.href)">JOSM</a>'+
+		'<a href="http://www.openstreetmap.org/edit?'+short_type+'='+id+'&editor=potlatch2" target="_blank">Potlatch</a>'+
+		'&nbsp;&nbsp;<a href="http://localhost:8111/load_object?objects='+ short_type+id+'&select='+short_type+id+'" target="josm" onclick="return josm(this.href)">JOSM</a>'+
 		'&nbsp;&nbsp;<a href="http://www.openstreetmap.org/browse/'+type+'/'+id+'" target="_blank">Details</a>';
 	return content;
 }
@@ -503,8 +503,8 @@
 <script type="text/javascript" src="js/popupmarker.js"></script>
 <script type="text/javascript" src="js/loadstatus.js"></script>
 <script type="text/javascript" src="js/zoomstatus.js"></script>
-<script type="text/javascript" src="opening_hours.js/opening_hours.js"></script>
 <script type="text/javascript" src="opening_hours.js/js/suncalc/suncalc.js"></script>
+<script type="text/javascript" src="opening_hours.js/opening_hours.js"></script>
 <script type="text/javascript" src="opening_hours.js/js/i18next-1.6.3.min.js"></script>
 <script type="text/javascript" src="opening_hours.js/js/i18n-resources.js"></script>
 <script type="text/javascript" src="opening_hours.js/js/opening_hours_table.js"></script>