diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/index.html b/index.html
old mode 100644
new mode 100755
index f24e1ae..44abacb
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
- Brief Toronto Tour
+ Assignment Three: HIS495Y
@@ -46,17 +48,10 @@
-
+
-# Next Section
-
-The rest of your essay should go under the map, probably.
-
-## in sections like this
-also _italics_ and __bold__ which can also be written *like this* or **like this**
-etc. Be sure to [make use of links](http://digital.hackinghistory.ca) -- that's one of the reasons we write on the Web, and I've asked you to use links for all yor footnotes/references as well.
-
+
diff --git a/script.js b/script.js
old mode 100644
new mode 100755
index f45cf3d..0695894
--- a/script.js
+++ b/script.js
@@ -3,7 +3,7 @@
// whenever we need to -- they have 'global scope'
var my_map; // this will hold the map
var my_map_options; // this will hold the options we'll use to create the map
-var my_center = new google.maps.LatLng(41.9000,12.5000); // center of map
+var my_center = new google.maps.LatLng(43.349243, -78.365479); // center of map
var my_markers = []; // we use this in the main loop below to hold the markers
// this one is strange. In google maps, there is usually only one
// infowindow -- its content and position change when you click on a
@@ -24,7 +24,7 @@ var blue_markers = [];
function initialize() {
my_map_options = {
center: my_center, // to change this value, change my_center above
- zoom: 13, // higher is closer-up
+ zoom: 7, // higher is closer-up
mapTypeId: google.maps.MapTypeId.HYBRID // you can also use TERRAIN, STREETMAP, SATELLITE
};
@@ -33,25 +33,44 @@ function initialize() {
my_map_options);
// this is an *array* that holds all the marker info
var all_my_markers =
- [{position: new google.maps.LatLng(41.9000,12.5000),
+ [{position: new google.maps.LatLng(44.232701, -76.478391),
map: my_map,
icon: blueURL, // this sets the image that represents the marker in the map to the one
// located at the URL which is given by the variable blueURL, see above
- title: "first Marker",
- window_content: "Marker1
and this would be the extended description
"
+ title: " FortFrontenac",
+ window_content: "Fort Frontenac
Also called Fort Oswego by 18th century trader John Long- he describes this fort as being the key to the United States as it facilitated passageway to the North and to the Hudson River.
"
},
- {position: new google.maps.LatLng(41.8902,12.4923),
+ {position: new google.maps.LatLng(42.299369, -83.096096),
map: my_map,
icon: blueURL, // this sets the image that represents the marker in the map
- title: "second Marker",
- window_content: "Marker2
and this would be the extended description
"
+ title: " FortDetroit",
+ window_content: " Fort Detroit
An initially highly contentious fort, through agreements between the French and the Iroquois the fort was finally built. The French claimed that the fort would act as a place of arbitration for the hunting grounds surrounding it as well as provide the Iroquois with arms and provisions.
"
},
- {position: new google.maps.LatLng(41.8986,12.4768),
+ {position: new google.maps.LatLng(43.262389, -79.063116),
map: my_map,
- icon: redURL, // this sets the image that represents the marker in the map
- title: "third Marker",
- window_content: "Marker3
and this would be the extended description
"
- }
+ icon: blueURL, // this sets the image that represents the marker in the map
+ title: " FortNiagara",
+ window_content: " Fort Niagara
An important fort which would later come into British posession thanks to negotiations with the Seneca Native Indians. This fort was also the strategical supply point for the British and key for being able to quickly transport troops west in case of rebellion or war.
"
+
+ },
+ {position: new google.maps.LatLng(42.652579, -73.756232),
+ map: my_map,
+ icon: redURL, // this sets the image that represents the marker in the map
+ title: " Albany",
+ window_content: " Albany
Albany was a major trade hub where many Native groups such as the Iroquois and the western tribes often sold their pelts. The merchants at this post would often send agents to other forts such as Fort Frontenac in order to procure goods.
"
+ },
+ {position: new google.maps.LatLng(41.866748, -77.838135),
+ map: my_map,
+ icon: redURL, // this sets the image that represents the marker in the map
+ title: "NativeTerritory",
+ window_content: " Native Territories
According to 18th century trader John Long, all land beneath Lake Ontario, Lake Erie, and the St. Lawrence River was claimed by the Five Nations Natives.
"
+ },
+ {position: new google.maps.LatLng(43.654460, -77.893066),
+ map: my_map,
+ icon: redURL, // this sets the image that represents the marker in the map
+ title: "War on the Lake",
+ window_content: "War on the Lake
In one of his accounts John Long writes that women and children sometimes sang war songs while rowing their canoes across Lake Ontario.
"
+ }
];
for (j = 0; j < all_my_markers.length; j++) {
@@ -63,8 +82,8 @@ function initialize() {
window_content: all_my_markers[j].window_content});
// this next line is ugly, and you should change it to be prettier.
- // be careful not to introduce syntax errors though.
- legendHTML += " " + marker.title + "
" + marker.window_content + "
";
+ // be careful not to introduce syntax errors though.
+ legendHTML += " " + marker.window_content + "
";
marker.info = new google.maps.InfoWindow({content: marker.window_content});
var listener = google.maps.event.addListener(marker, 'click', function() {
// if you want to allow multiple info windows, uncomment the next line
@@ -79,10 +98,10 @@ function initialize() {
} else if (all_my_markers[j].icon == redURL ) {
red_markers.push({marker:marker, listener:listener});
}
-
+
}
document.getElementById("map_legend").innerHTML = legendHTML;
-
+
}
// this hides all markers in the array
@@ -102,7 +121,7 @@ function showMarkers (marker_array, map) {
}
// I added this for fun. It allows you to trigger the infowindow
-// form outside the map.
+// form outside the map.
function locateMarker (marker) {
console.log(marker);
my_map.panTo(marker.marker.position);
diff --git a/style.css b/style.css
old mode 100644
new mode 100755
index a9552ec..b951695
--- a/style.css
+++ b/style.css
@@ -1,6 +1,9 @@
/* This is a very simple CSS setup that shows the size of the relevant divs and -- important! -- sets the size of the map container */
/* add any styling for the central column here */
+p {
+ text-indent: 50px !important;
+}
div.container {
}
@@ -22,13 +25,13 @@ div#map_canvas {
/* this is the legend div. Can you make it into a right sidebar? you may
have to add some extra css to the mapcontainer div */
div#map_legend {
-
+border:10px
}
/* if you want, you can make the text in the legend less ugly by adding
extra css classes */
-div#map_legend h1, div#map_legend h3 {
-
+div#map_legend h3, div#map_legend h4 {
+ background-color:E3E3E3 !important;
}
// make it obvious that the legend text is clickable
@@ -48,10 +51,10 @@ button.rounded {
border: 1px black solid;
}
button#hide {
- background:orange;
+ background:red;
}
button#show {
- background:green;
+ background:orange;
}
/* use these last three to style the text inside the
@@ -60,10 +63,13 @@ button#show {
*/
-div#map_canvas h1 {
+div#map_canvas h1 {font-size:14;
}
+#map_legend h2 {
+ font-size: 12px;
+}
div.address {
}
@@ -71,4 +77,3 @@ div.address {
div.description {
}
-