diff --git a/Gemfile.lock b/Gemfile.lock index 2bf38bc8..32e314e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM minitest (5.10.1) multi_json (1.12.1) nio4r (1.2.1) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) parser (2.3.3.1) ast (~> 2.2) @@ -205,7 +205,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) - rubyzip (1.2.0) + rubyzip (1.2.1) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -303,4 +303,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.13.6 + 1.14.6 diff --git a/app/assets/images/help/additional-details-multiple.png b/app/assets/images/help/additional-details-multiple.png new file mode 100644 index 00000000..0253dfc8 Binary files /dev/null and b/app/assets/images/help/additional-details-multiple.png differ diff --git a/app/assets/images/help/base-map-toggle.png b/app/assets/images/help/base-map-toggle.png new file mode 100644 index 00000000..defc86d6 Binary files /dev/null and b/app/assets/images/help/base-map-toggle.png differ diff --git a/app/assets/images/help/brac-details.png b/app/assets/images/help/brac-details.png new file mode 100644 index 00000000..075154c3 Binary files /dev/null and b/app/assets/images/help/brac-details.png differ diff --git a/app/assets/images/help/clear-search.png b/app/assets/images/help/clear-search.png new file mode 100644 index 00000000..22aa4802 Binary files /dev/null and b/app/assets/images/help/clear-search.png differ diff --git a/app/assets/images/help/error-message.png b/app/assets/images/help/error-message.png new file mode 100644 index 00000000..a163efd6 Binary files /dev/null and b/app/assets/images/help/error-message.png differ diff --git a/app/assets/images/help/geolocation.png b/app/assets/images/help/geolocation.png new file mode 100644 index 00000000..0128975d Binary files /dev/null and b/app/assets/images/help/geolocation.png differ diff --git a/app/assets/images/help/legend.png b/app/assets/images/help/legend.png new file mode 100644 index 00000000..9d90e0a8 Binary files /dev/null and b/app/assets/images/help/legend.png differ diff --git a/app/assets/images/help/pegman.png b/app/assets/images/help/pegman.png new file mode 100644 index 00000000..5fc2a4b7 Binary files /dev/null and b/app/assets/images/help/pegman.png differ diff --git a/app/assets/images/help/printable-version.png b/app/assets/images/help/printable-version.png new file mode 100644 index 00000000..3463edd2 Binary files /dev/null and b/app/assets/images/help/printable-version.png differ diff --git a/app/assets/images/help/qualified-with-expiration.png b/app/assets/images/help/qualified-with-expiration.png new file mode 100644 index 00000000..15b0c00e Binary files /dev/null and b/app/assets/images/help/qualified-with-expiration.png differ diff --git a/app/assets/images/help/search-bar.png b/app/assets/images/help/search-bar.png new file mode 100644 index 00000000..cf8802db Binary files /dev/null and b/app/assets/images/help/search-bar.png differ diff --git a/app/assets/images/help/search-icon.png b/app/assets/images/help/search-icon.png new file mode 100644 index 00000000..f9bc4dc1 Binary files /dev/null and b/app/assets/images/help/search-icon.png differ diff --git a/app/assets/images/help/search-query.png b/app/assets/images/help/search-query.png new file mode 100644 index 00000000..ac8514d5 Binary files /dev/null and b/app/assets/images/help/search-query.png differ diff --git a/app/assets/images/help/search-results.png b/app/assets/images/help/search-results.png new file mode 100644 index 00000000..2258423d Binary files /dev/null and b/app/assets/images/help/search-results.png differ diff --git a/app/assets/images/help/zoom-control.png b/app/assets/images/help/zoom-control.png new file mode 100644 index 00000000..2967f04b Binary files /dev/null and b/app/assets/images/help/zoom-control.png differ diff --git a/app/assets/javascripts/hzmap/hz-query.js b/app/assets/javascripts/hzmap/hz-query.js index c1f78769..b6e6cd65 100644 --- a/app/assets/javascripts/hzmap/hz-query.js +++ b/app/assets/javascripts/hzmap/hz-query.js @@ -24,31 +24,31 @@ HZApp.HZQuery = { }, handleBadResponses: function(responseStatus){ if (responseStatus === 'ZERO_RESULTS' || responseStatus === 'INVALID_REQUEST'){ - $('.sidebar-card.map-report').hide(); + $('.sidebar-card.map-actions').hide(); $('#sidebar-content').addClass('zero-results'); $('#legend').addClass('zero-results'); } else { - $('.sidebar-card.map-report').show(); + $('.sidebar-card.map-actions').show(); $('#sidebar-content').removeClass('zero-results'); $('#legend').removeClass('zero-results'); } }, parseResponseGeometry: function(response){ - if (HZApp.HZQuery.response.geometry){ + if (response.geometry){ HZApp.MapUtils.jumpToLocation({ viewport: response.geometry.viewport, location: response.geometry.location }); - this.response.geocodeLocation = response.geometry.location; - if (response.place_id){ this.query.q = response.formatted_address; this.query.latlng = null; } else { this.query.q = null; - this.query.latlng = [response.geocodeLocation.lat, response.geocodeLocation.lng ].join(','); + this.query.latlng = [response.geometry.location.lat, response.geometry.location.lng ].join(','); } + + this.response.geocodeLocation = response.geometry.location; } }, updateMap: function(){ diff --git a/app/assets/javascripts/hzmap/layer-defs.js b/app/assets/javascripts/hzmap/layer-defs.js index c853e62b..2a51af8f 100644 --- a/app/assets/javascripts/hzmap/layer-defs.js +++ b/app/assets/javascripts/hzmap/layer-defs.js @@ -37,6 +37,12 @@ HZApp.Layers.LayerDefs = (function(){ layerGroup: 'qct', isVisible: true, overlay:[], + }, + qda_lg: { + layerIndex: 5, + layerGroup: 'qda', + isVisible: true, + overlay:[], } } }; diff --git a/app/assets/javascripts/hzmap/legend-defs.js b/app/assets/javascripts/hzmap/legend-defs.js index d8fb4a70..cd5e28ae 100644 --- a/app/assets/javascripts/hzmap/legend-defs.js +++ b/app/assets/javascripts/hzmap/legend-defs.js @@ -4,131 +4,39 @@ // order in this object defines draw order on the map: // first object is drawn first, then next on top of that, etc. HZApp.Legend.LegendDefs = (function(){ - var legendDefaults = { - circleFillColor: '#FFFFFF', - circleFillOpacity: 0.5, - circleStrokeColor: '#CCCCCC', - circleStrokeOpacity: 1, - circleStrokeWidth: 1, - displacementX: 0, - displacementY: 0, - fillColor: '#CCCCCC', - fillOpacity: 0.5, - graphicSpacing: 10, - lineStrokeColor: '#fff', - lineStrokeOpacity: 1, - lineStrokeWidth: 1, - lineRotation: 0, - strokeColor: '#CCCCCC', - strokeOpacity: 1, - strokeWidth: 1.25, - tileSize: 10, - - // // USWDS Alt 1 - // qctColor: '#2E8540', - // qnmcColor: '#0071BB', - // indianLandsColor: '#4C2C92' - - // Tyler 1 - qctColor: '#0D465C', - qnmcColor: '#BA233F', - indianLandsColor: '#009DCD' - }; - var legendKeys = { qct: { title: "Census Tract", svg: [], canToggle: true, - layerGroup: 'qct', - styleOptions: [ - { - type: 'polygon', - fillColor: legendDefaults.qctColor, - fillOpacity: legendDefaults.fillOpacity, - strokeColor: legendDefaults.qctColor, - strokeOpacity: legendDefaults.strokeOpacity, - strokeWidth: legendDefaults.strokeWidth - } - ] + layerGroup: 'qct' }, qnmc: { title: "County", svg: [], canToggle: true, - layerGroup: 'qnmc', - styleOptions: [ - { - type: 'polygon', - fillColor: legendDefaults.qnmcColor, - fillOpacity: legendDefaults.fillOpacity, - strokeColor: legendDefaults.qnmcColors, - strokeOpacity: legendDefaults.strokeOpacity, - strokeWidth: legendDefaults.strokeWidth - } - ] + layerGroup: 'qnmc' }, indian_lands: { title: "Indian Land", svg: [], canToggle: true, - layerGroup: 'indian_lands', - styleOptions: [ - { - type: 'polygon', - fillColor: legendDefaults.indianLandsColor, - fillOpacity: legendDefaults.fillOpacity, - strokeColor: legendDefaults.indianLandsColor, - strokeOpacity: legendDefaults.strokeOpacity, - strokeWidth: legendDefaults.strokeWidth - } - ] + layerGroup: 'indian_lands' }, redesignated: { title: "Redesignated", svg: [], canToggle: true, - layerGroup: 'redesignated', - styleOptions: [ - { - type: 'horline', - lineStrokeColor: legendDefaults.lineStrokeColor, - lineStrokeWidth: 5, - lineStrokeOpacity: legendDefaults.fillOpacity, - strokeWidth: legendDefaults.strokeWidth, - strokeColor: legendDefaults.lineStrokeColor, - strokeOpacity: legendDefaults.strokeOpacity, - tileSize: 30, - lineRotation: 0 - } - ] + layerGroup: 'redesignated' }, brac: { title: "Base Closure Area", svg: [], canToggle: true, - layerGroup: 'brac', - styleOptions: [ - { - type: 'circle', - circleFillColor: '#fff', - circleFillOpacity: legendDefaults.fillOpacity, - circleStrokeColor: '#fff', - circleStrokeOpacity: legendDefaults.strokeOpacity, - circleStrokeWidth: legendDefaults.strokeWidth, - strokeColor: '#000000', - strokeOpacity: legendDefaults.strokeOpacity, - strokeWidth: legendDefaults.strokeWidth, - tileSize: 15, - graphicSpacing: legendDefaults.graphicSpacing - } - ] + layerGroup: 'brac' }, }; - return { - legendDefaults: legendDefaults, legend: legendKeys }; - })(); diff --git a/app/assets/javascripts/hzmap/legend.js.erb b/app/assets/javascripts/hzmap/legend.js.erb index 49ca049f..4941c317 100644 --- a/app/assets/javascripts/hzmap/legend.js.erb +++ b/app/assets/javascripts/hzmap/legend.js.erb @@ -2,147 +2,38 @@ HZApp.Legend = (function(){ return { legend: HZApp.Legend.LegendDefs.legend, - buildLegend: function(layers){ - Object.keys(layers).map(function(layer){ - var legendConfig = HZApp.Legend.getConfigFromLayerStyle(layers[layer]); - HZApp.Legend.legend[legendConfig.layerGroup].svg.push(HZApp.Legend.svgFromStyle(legendConfig)); - }); - - Object.keys(this.legend).map(HZApp.Legend.insertLegendItem); - + buildLegend: function(){ this.addLegendButtonListeners(); - - this.setLegendState(window.innerWidth); - + this.setMobileState(window.innerWidth); this.addLayerToggleListeners(); - }, addLegendButtonListeners: function(){ - $('#legend-header').click(function(event) { + $('.legend-header').click(function(event) { HZApp.Legend.toggleLegendVisibility(event.currentTarget.className); }); }, toggleLegendVisibility: function(legendState) { - if(legendState === 'open') { + if(legendState.includes('open')) { HZApp.Legend.hideLegend(); - $('#legend-header').removeClass('open'); } else { HZApp.Legend.showLegend(); - $('#legend-header').addClass('open'); } }, - getConfigFromLayerStyle: function(layer){ - return { - layerGroup: layer.layerGroup, - styleType: layer.styleOptions[0].type, - styleColor: layer.styleOptions[0][HZApp.Legend.legendTypeToColorType[layer.styleOptions[0].type]] - }; - }, - svgFromStyle: function(style){ - var width = 34, height = 29; - var svg = this.svgHeader(width, height); - svg += 'hubzone legend'; - var svg_fn_name = "svg_" + style.styleType; - svg += HZApp.Legend[svg_fn_name](style,width, height); - svg += ''; - return svg; - }, - svgHeader: function(width, height){ - return ('' - ); - }, - svg_polygon: function(style, width, height){ - return ( '' + - '' + - '' - ); - }, - svg_horline: function(style, width, height){ - return ( - // '' + - '' + - '' + - '' + - '' + - // '' + - '' + - '' + - '' + - '' + - '' - ); - }, - svg_circle: function(style, width, height){ - return ( - // '' + - '' + - '' + - '' + - '' + - // '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' - ); - }, - insertLegendItem: function(legendItem) { - HZApp.Legend.legend[legendItem].canToggle ? HZApp.Legend.insertLegendItemToggle(legendItem) : HZApp.Legend.insertLegendItemNoToggle(legendItem); - }, - insertLegendItemToggle: function(legendItem){ - var li = '
  • '; - li += ''; - li += ''; - li += '
    • '; - $('#legend > ul').append(li); - }, - // insertLegendItemNoToggle: function(legendItem){ - // var li = '
  • '; - // HZApp.Legend.legend[legendItem].svg.map(function(svg){ li += svg; }); - // li += '' + I18n.t('legend.' + legendItem) + ''; - // li += '
    • '; - // $('#legend > ul').append(li); - // }, - legendTypeToColorType: { //mapping style type to css/svg color parameter - 'polygon': 'fillColor', - 'circle': 'circleFillColor', - 'horline': 'lineStrokeColor' - }, hideLegend: function(){ - $('#legend li.legend-item').hide(); - $('#hide-legend-button').hide(); - $('#legend-header-title-expanded').hide(); - $('#legend-header-title-hidden').show(); - $('#show-legend-button').show(); + $('.legend-item').hide(); + $('.legend-button').addClass("fa-chevron-up").removeClass("fa-chevron-down"); + $('.legend-content').hide(); + $('.legend-header').removeClass('open'); }, showLegend: function(){ - $('#legend li.legend-item').show(); - $('#hide-legend-button').show(); - $('#legend-header-title-expanded').show(); - $('#legend-header-title-hidden').hide(); - $('#show-legend-button').hide(); - }, - setLegendState: function(windowWidth) { - if (windowWidth > 950) { - HZApp.Legend.toggleLegendVisibility(''); - } else { - HZApp.Legend.toggleLegendVisibility('open'); + $('.legend-item').show(); + $('.legend-button').addClass("fa-chevron-down").removeClass("fa-chevron-up"); + $('.legend-content').show(); + $('.legend-header').addClass('open'); + }, + setMobileState: function(windowWidth) { + if (windowWidth < 950) { + HZApp.Legend.hideLegend(); } }, addLayerToggleListeners: function() { diff --git a/app/assets/javascripts/hzmap/map-utils.js.erb b/app/assets/javascripts/hzmap/map-utils.js.erb index 16ea6fba..6539aab3 100644 --- a/app/assets/javascripts/hzmap/map-utils.js.erb +++ b/app/assets/javascripts/hzmap/map-utils.js.erb @@ -1,4 +1,5 @@ HZApp.MapUtils = (function(){ + return { // turn latlng object into url catchMapClick: function(clickEvent){ @@ -26,20 +27,111 @@ HZApp.MapUtils = (function(){ //jump to location on the map based on the geocode viewport object jumpToLocation: function(geocodeLocation){ if (geocodeLocation.viewport){ - var newBounds = this.createGoogleLatLngBounds( - geocodeLocation.viewport.southwest.lng, - geocodeLocation.viewport.southwest.lat, - geocodeLocation.viewport.northeast.lng, - geocodeLocation.viewport.northeast.lat - ); - HZApp.map.fitBounds(newBounds); + var customFit = this.getBoundsZoomLevel(geocodeLocation.viewport, this.getMapDims($('#map'))); + if (customFit.fitZoom < 15){ + var newBounds = this.createGoogleLatLngBounds( + geocodeLocation.viewport.southwest.lng, + geocodeLocation.viewport.southwest.lat, + geocodeLocation.viewport.northeast.lng, + geocodeLocation.viewport.northeast.lat + ); + HZApp.map.fitBounds(newBounds); + } else { + this.panAndZoom(customFit.center, 15); + } } }, + getMapDims: function($el){ + return { + height: $el.height(), + width: $el.width() + }; + }, + panAndZoom: function(center, zoom){ + HZApp.map.setZoom(zoom); + HZApp.map.setCenter(center); + }, + getBoundsZoomLevel: function(viewport, mapDims) { + var WORLD_DIM = { height: 256, width: 256 }; + var ZOOM_MAX = 21; + + function latRad(lat) { + var sin = Math.sin(lat * Math.PI / 180); + var radX2 = Math.log((1 + sin) / (1 - sin)) / 2; + return Math.max(Math.min(radX2, Math.PI), -Math.PI) / 2; + } + + function zoom(mapPx, worldPx, fraction) { + return Math.floor(Math.log(mapPx / worldPx / fraction) / Math.LN2); + } + var ne = viewport.northeast; + var sw = viewport.southwest; + + var latFraction = (latRad(ne.lat) - latRad(sw.lat)) / Math.PI; + + var lngDiff = ne.lng - sw.lng; + var lngFraction = ((lngDiff < 0) ? (lngDiff + 360) : lngDiff) / 360; + + var latZoom = zoom(mapDims.height, WORLD_DIM.height, latFraction); + var lngZoom = zoom(mapDims.width, WORLD_DIM.width, lngFraction); + + var latAvg = (ne.lat + sw.lat) / 2.0; + var lngAvg = (ne.lng + sw.lng) / 2.0; + + return { + fitZoom: Math.min(latZoom, lngZoom, ZOOM_MAX), + center: new google.maps.LatLng(latAvg, lngAvg) + }; + }, createGoogleLatLngBounds: function(SWLng, SWLat, NELng, NELat){ return new google.maps.LatLngBounds( new google.maps.LatLng(SWLat, SWLng), new google.maps.LatLng(NELat, NELng) ); }, + mapNameUpdates: [ + {mapType:'roadmap', newName: 'Standard'}, + {mapType:'hz_map', newName: 'Light Gray'}, + {mapType:'hybrid', newName: 'Satellite'} + ], + updateMapTypeNames: function(){ + HZApp.MapUtils.mapNameUpdates.map(HZApp.MapUtils.customMapTypeName); + HZApp.map.setOptions({'mapTypeControl':true}); + }, + customMapTypeName: function(mapNameUpdate){ + if (!HZApp.map.mapTypes[mapNameUpdate.mapType]) { return; } + HZApp.map.mapTypes[mapNameUpdate.mapType].name = mapNameUpdate.newName; + }, + + /* + This is a convenience method for helping to parse the base map style object at HZApp.Styles.hzBaseMapStyle + to the format required by the Google Maps Static API (https://developers.google.com/maps/documentation/static-maps/styling, 2017-05-05) + so that the report map style can match the web map style. + It is intended that this method would only need to be called manually to produce the style string which could then be included in the + Report repo directly within the wms_utl.rb class at hz_base_map_style + */ + parseStyleToStaticUrl: function(styles){ + styles = styles || HZApp.Styles.hzBaseMapStyle; + var stylesOut = []; + + styles.map( function(style){ + var styleStr = '&style='; + + styleStr += 'feature:' + style.featureType + '|'; + styleStr += 'element:' + style.elementType + '|'; + + var styleTags = []; + style.stylers.map( function(s) { + var s_key = Object.keys(s)[0]; + styleTags.push(s_key + ':' + s[s_key]); + }); + + styleStr += styleTags.join('|'); + styleStr = styleStr.replace(/\#/g, '0x'); + stylesOut.push(styleStr); + }); + + return encodeURI(stylesOut.join('&')); + } }; })(); diff --git a/app/assets/javascripts/hzmap/map.js.erb b/app/assets/javascripts/hzmap/map.js.erb index 305d049d..47ced47e 100644 --- a/app/assets/javascripts/hzmap/map.js.erb +++ b/app/assets/javascripts/hzmap/map.js.erb @@ -12,12 +12,20 @@ function initMap() { streetViewControlOptions: { position: google.maps.ControlPosition.RIGHT_BOTTOM }, + mapTypeId: 'hz_map', mapTypeControlOptions: { - mapTypeIds: ['roadmap', 'hz_map', 'hybrid' ], - position: google.maps.ControlPosition.BOTTOM_CENTER - } + mapTypeIds: ['hz_map','roadmap', 'hybrid' ], + position: google.maps.ControlPosition.BOTTOM_CENTER, + style: google.maps.MapTypeControlStyle.HORIZONTAL_BAR + }, }); + + //reset mapType names + //refer to maptype spec: https://developers.google.com/maps/documentation/javascript/3.exp/reference#MapType + HZApp.map.setOptions({'mapTypeControl':false}); + google.maps.event.addListenerOnce(HZApp.map, 'idle', HZApp.MapUtils.updateMapTypeNames); + //adds in the hz style into the basemap picker var hzStyledMap = new google.maps.StyledMapType(HZApp.Styles.hzBaseMapStyle, {name: 'Gray'}); HZApp.map.mapTypes.set('hz_map', hzStyledMap); @@ -29,7 +37,7 @@ function initMap() { //add in the WMS tiles HZApp.WMTSUtils.initializeTiles(); - //add listener on the map for clciks + //add listener on the map for clciks HZApp.WMTSUtils.addClickListeners(HZApp.map); //adds autocomplete and click listener diff --git a/app/assets/javascripts/hzmap/sidebar.js b/app/assets/javascripts/hzmap/sidebar.js index df5af5c0..bd1c1904 100644 --- a/app/assets/javascripts/hzmap/sidebar.js +++ b/app/assets/javascripts/hzmap/sidebar.js @@ -1,27 +1,26 @@ //Sidebar utils -HZApp.SidebarUtils = (function(){ +HZApp.SidebarUtils = (function(){ // extend jquery with our sidebar function $.fn.sidebar = function() { var $sidebar = this; - $sidebar.currentClass = 'hidden'; $sidebar.update = function() { if (!$sidebar.hasClass('on')) { $sidebar.addClass('on'); $('#legend').addClass('legend-mobile'); $sidebar.removeClass('hidden'); + $sidebar.removeClass('closed'); $('#sidebar-button').html(''); $('div.gmnoprint[controlheight="55"], div.gmnoprint[controlheight="66"], .gm-svpc').addClass('gm-sidebar-on'); $('#geolocation').addClass('geolocation-sidebar-on'); - $sidebar.currentClass = 'on'; } else { $sidebar.removeClass('on'); $('#legend').removeClass('legend-mobile'); + $sidebar.addClass('closed'); $('#sidebar-button').html(''); $('div.gmnoprint[controlheight="55"], div.gmnoprint[controlheight="66"], .gm-svpc').removeClass('gm-sidebar-on'); $('#geolocation').removeClass('geolocation-sidebar-on'); - $sidebar.currentClass = 'hidden'; $('#hubzone-qualifications').attr("aria-live", "off"); } }; @@ -44,7 +43,7 @@ HZApp.SidebarUtils = (function(){ triggerSidebar: function(){ $('#sidebar').hasClass('on') ? HZApp.GA.track( 'map', 'sidebar', 'hide' ) : HZApp.GA.track( 'map', 'sidebar', 'show' ); - $('#sidebar').hasClass('on') ? HZApp.SidebarUtils.sidebar.close() : HZApp.SidebarUtils.sidebar.open(); + $('#sidebar').hasClass('on') ? HZApp.SidebarUtils.sidebar.close() : HZApp.SidebarUtils.sidebar.open(); }, sidebar: {}, buildSidebar: function(){ @@ -59,4 +58,3 @@ HZApp.SidebarUtils = (function(){ } }; })(); - diff --git a/app/assets/javascripts/hzmap/wmts-utils.js.erb b/app/assets/javascripts/hzmap/wmts-utils.js.erb index 5208c923..0a820a8b 100644 --- a/app/assets/javascripts/hzmap/wmts-utils.js.erb +++ b/app/assets/javascripts/hzmap/wmts-utils.js.erb @@ -1,9 +1,9 @@ // web map tile service utilites HZApp.WMTSUtils = (function(){ - - Math.sinh = Math.sinh || function(angle){ + + Math.sinh = Math.sinh || function(angle){ return (Math.exp(angle) - Math.exp(-angle)) / 2; - }; + }; return { tileSize: 256, @@ -31,7 +31,28 @@ HZApp.WMTSUtils = (function(){ HZApp.Layers.LayerDefs.hzWMSOverlays[layer].overlay = customMapType; HZApp.map.overlayMapTypes.insertAt(layerIndex, customMapType); }, + // Normalizes the coords that tiles repeat across the x axis (horizontally) + // like the standard Google map tiles. + getNormalizedCoord: function(coord, zoom) { + var y = coord.y; + var x = coord.x; + // tile range in one direction range is dependent on zoom level + // 0 = 1 tile, 1 = 2 tiles, 2 = 4 tiles, 3 = 8 tiles, etc + var tileRange = 1 << zoom; + + if (y < 0 || y >= tileRange) { // don't repeat across y-axis (vertically) + y = y; + } + + if (x < 0 || x >= tileRange) { // repeat across x-axis + x = (x % tileRange + tileRange) % tileRange; + } + return {x: x, y: y}; + }, tile2Bbox: function(x, y, zoom){ + var normCoord = this.getNormalizedCoord({x: x, y: y}, zoom); + x = normCoord.x; + y = normCoord.y; var bb = {}; bb.n = this.tile2Lat(y,zoom); bb.s = this.tile2Lat(y+1, zoom); @@ -43,21 +64,17 @@ HZApp.WMTSUtils = (function(){ return [webMSW[0], webMSW[1], webMNE[0], webMNE[1]].join(','); }, toWebMercator: function(x_lon, y_lat){ - if ((Math.abs(x_lon) > 180) || (Math.abs(y_lat) > 90)){ - return []; - } else { - var semimajor_axis = 6378137.0; - var east = x_lon * 0.017453292519943295; - var north = y_lat * 0.017453292519943295; - var northing = 3189068.5 * Math.log((1.0 + Math.sin(north)) / (1.0 - Math.sin(north))); - var easting = semimajor_axis * east; - return [easting, northing]; - } + var semimajor_axis = 6378137.0; + var east = x_lon * 0.017453292519943295; + var north = y_lat * 0.017453292519943295; + var northing = 3189068.5 * Math.log((1.0 + Math.sin(north)) / (1.0 - Math.sin(north))); + var easting = semimajor_axis * east; + return [easting, northing]; }, tile2Lng: function(x, z){ return (x / Math.pow(2.0, z) * 360.0 - 180); }, - tile2Lat: function(y,z) { + tile2Lat: function(y,z) { var n = Math.PI - (2.0 * Math.PI * y) / Math.pow(2.0, z); return this.toDegrees(Math.atan(Math.sinh(n))); }, @@ -74,11 +91,12 @@ HZApp.WMTSUtils = (function(){ url += "&VERSION=1.1.1"; url += "&REQUEST=GetMap"; url += "&SRS=EPSG:900913"; - url += "&bbox=" + this.tile2Bbox(coord.x, coord.y, zoom); + // url += "&SRS=EPSG:4326"; + url += "&bbox=" + this.tile2Bbox(coord.x, coord.y, zoom); url += "&width=" + this.tileSize; url += "&height=" + this.tileSize; url += "&format=image/png"; - return url; + return url; }, addClickListeners: function(overlay) { overlay.addListener('click', this.handleSingleClick); diff --git a/app/assets/stylesheets/_globals.scss b/app/assets/stylesheets/_globals.scss index f4d336fd..2724ccfa 100644 --- a/app/assets/stylesheets/_globals.scss +++ b/app/assets/stylesheets/_globals.scss @@ -1,3 +1,3 @@ .hidden { - display: none; + display: none !important; } diff --git a/app/assets/stylesheets/_layers.scss b/app/assets/stylesheets/_layers.scss new file mode 100644 index 00000000..65cd1a4f --- /dev/null +++ b/app/assets/stylesheets/_layers.scss @@ -0,0 +1,60 @@ +@import "variables"; + +.layer-qct { + background-color: #0D465C; +} +.layer-qct_e { + background-color: #0D465C; +} +.layer-qct_brac { + background-color: #ffffff; + background-image: url("data:image/svg+xml;utf8,"); +} +.layer-qct_r { + background-color: #ffffff; + background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 40 40' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%230D465C' fill-opacity='1' fill-rule='evenodd'%3E%3Cpath d='M0 40L40 0H20L0 20M40 40V20L20 40'/%3E%3C/g%3E%3C/svg%3E"); +} +.layer-qnmc { + background-color: #BA233F; +} +.layer-qnmc_a { + background-color: #BA233F; +} +.layer-qnmc_ab { + background-color: #BA233F; +} +.layer-qnmc_b { + background-color: #BA233F; +} +.layer-qnmc_c { + background-color: #BA233F; +} +.layer-qnmc_dda { + background-color: #BA233F; +} +.layer-qnmc_e { + background-color: #BA233F; +} +.layer-qnmc_r { + background-color: #ffffff; + background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 40 40' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23BA233F' fill-opacity='1' fill-rule='evenodd'%3E%3Cpath d='M0 40L40 0H20L0 20M40 40V20L20 40'/%3E%3C/g%3E%3C/svg%3E"); +} +.layer-qnmc_brac { + background-color: #ffffff; + background-image: url("data:image/svg+xml;utf8,"); +} +.layer-indian_lands { + background-color: #009DCD; +} +.layer-brac { + background-color: #ffffff; + background-image: url("data:image/svg+xml;utf8,"); +} +.layer-qct_qda { + background-color: #ffffff; + background-image: url("data:image/svg+xml;utf8,"); +} +.layer-qnmc_qda { + background-color: #ffffff; + background-image: url("data:image/svg+xml;utf8,"); +} diff --git a/app/assets/stylesheets/_map_body.scss b/app/assets/stylesheets/_map_body.scss index d3dee09d..57fe91bf 100644 --- a/app/assets/stylesheets/_map_body.scss +++ b/app/assets/stylesheets/_map_body.scss @@ -2,7 +2,10 @@ .map-body { position: absolute; width: 100%; - height: calc(100% - 87px); + height: calc(100% - 80px); +} +.map-body:focus { + outline: none; } @media only screen and (max-width: 950px) { .map-body { diff --git a/app/assets/stylesheets/_map_header.scss b/app/assets/stylesheets/_map_header.scss index 239d9cab..70fce993 100644 --- a/app/assets/stylesheets/_map_header.scss +++ b/app/assets/stylesheets/_map_header.scss @@ -10,7 +10,7 @@ } .usa-logo-text a > h1 { font-family: $font-sans; - font-size: 3.6rem; + font-size: 3.5rem; font-weight: 700; color: $gray-dark; float: left; @@ -20,7 +20,7 @@ } .usa-nav-secondary { position: fixed; - top: -4.5rem; + top: -4.3rem; right: 2rem; } .usa-nav-secondary-links li:not(:last-child)::after { @@ -31,18 +31,18 @@ } .usa-banner-inner { max-width: 100%; - padding: 0 2rem 0 2rem; + padding-left: 1.5rem; } .usa-header-extended .usa-logo { - margin-top: 1rem; - margin-bottom: 1rem; + margin-top: .7rem; + margin-bottom: .7rem; } .usa-header-extended .usa-nav { border-top: none; } .usa-header-extended .usa-navbar { max-width: 100%; - padding: 0 2rem 0 2rem; + padding-left: 1.5rem; border-bottom: 2px solid $gray-lighter; } @media only screen and (max-width: 950px) { @@ -56,9 +56,17 @@ .usa-navbar { border-bottom: none; } + .usa-nav-secondary { + position: fixed; + top: inherit; + right: inherit; + } .usa-banner { display: none; } + .usa-menu-btn { + display: block; + } .usa-logo { margin-left: .5rem; } @@ -76,6 +84,9 @@ } } @media only screen and (max-width: 480px) { + .usa-unstyled-list > li { + margin: 1em 0; + } .usa-banner { display: none; } diff --git a/app/assets/stylesheets/_map_legend.scss b/app/assets/stylesheets/_map_legend.scss index 3c35b0e3..26bc614d 100644 --- a/app/assets/stylesheets/_map_legend.scss +++ b/app/assets/stylesheets/_map_legend.scss @@ -1,69 +1,103 @@ @import 'variables'; +@import 'layers'; #legend { font-family: $font-sans; font-size: 1.5rem; - background-color: $white; + margin: 0 0 0 1rem; + background-color: rgba(255,255,255,0.97); + border-radius: 3px; -webkit-box-shadow: 0px 1px 4px -1px rgba(0,0,0,0.29); -moz-box-shadow: 0px 1px 4px -1px rgba(0,0,0,0.29); box-shadow: 0px 1px 4px -1px rgba(0,0,0,0.29); - border-radius: 3px; - margin: 0 0 0 1rem; - padding: 1rem; } -#legend label { - margin-top: 0.3rem; +.legend-header { + cursor: pointer; + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 0.8rem 1rem; } -#legend ul { - list-style-type: none; - padding-left: 0; +.legend-header h4 { margin: 0; + padding: 0; + color: $gray-dark; } -#legend li svg:not(:root) { - margin-bottom: -0.9rem; +.legend-button { + float: right; + color: $gray-dark; + margin-left: 0.5rem; + margin-top: 0.1rem; + font-size: 1.7rem; } -#legend-header { - margin-bottom: 0; +.legend-content { display: block; - cursor: pointer; + list-style-type: none; + margin: 0; + padding: .6rem 1rem 1rem 1rem; + box-shadow: inset 0px 1px 0 0px $gray-lighter; } -.legend-title { +.legend-list-title { color: $gray-dark; - font-size: 1.8rem; - font-weight: bold; - padding-right: 0; + font-size: 1.6rem; + margin-bottom: 0.5rem; } -#legend-button-div { +.legend-item label { + font-size: 1.4rem; color: $gray-dark; - float: right; - padding-top: 0; - padding-left: .5rem; - padding-right: .5rem; - font-size: 1.7rem; + display: flex; + align-items: center; + margin-top: 0.3rem; + margin-left: 0.3rem; } -.no-toggle { - padding-left: 2.7rem; +.legend-layer-symbols { + background-size: 0.9rem; + width: 2.4rem; + height: 2.4rem; + margin-right: 0.5rem; } -[type="checkbox"]:checked + label::before, -[type="radio"]:checked + label::before { - background-color: $gray-dark; - box-shadow: 0 0 0 1px $gray-dark; +.legend-content input[type="checkbox"] { + margin-left: 0; } - -[type="radio"]:checked + label::before { - box-shadow: 0 0 0 2px #ffffff, 0 0 0 4px $gray-dark; +.legend-content input[type="checkbox"]:checked + label::before{ + background-color: $white; + box-shadow: 0 0 0 2px $gray-dark; } - -[type="checkbox"]:focus + label::before { +.legend-content input[type="checkbox"]:focus + label::before { box-shadow: 0 0 0 1px #ffffff, 0 0 0 3px $gray-dark; } @media only screen and (max-width: 950px) { + .zero-results{ + bottom: 12.5rem !important; + } .legend-mobile { - bottom: 11rem !important; + bottom: 12.5rem !important; } - - #legend.zero-results{ - bottom: 6rem !important; + .legend-content { + padding: 0.5rem 1rem; + } + .legend-header { + padding: 0.7rem 1rem; + } + .legend-header h4{ + font-size: 1.5rem; + } + .legend-button { + font-size: 1.5rem; + } + .legend-list-title { + font-size: 1.5rem; + margin-bottom: 0; + } + .legend-item { + font-size: 1.3rem; + } + .legend-item label { + margin-top: 0; + } + .legend-layer-symbols { + width: 2.25rem; + height: 2.25rem; } } diff --git a/app/assets/stylesheets/_map_search.scss b/app/assets/stylesheets/_map_search.scss index 72d74b81..6518661d 100644 --- a/app/assets/stylesheets/_map_search.scss +++ b/app/assets/stylesheets/_map_search.scss @@ -4,13 +4,13 @@ position: absolute; top: 10px; z-index: 3; - left: 1.6rem; + left: 1.2rem; } #search-field-small { background-color: $white; border: .5px solid $gray; border-right: none; - height: 4rem; + height: 3.8rem; font-size: 2rem; color: $gray-dark; padding: 1rem 2em 1rem 0.7rem; @@ -27,8 +27,8 @@ } #hubzone-search-button { background-color: $gray-dark; - background-size: 4rem; - height: 4rem; + background-size: 3.8rem; + height: 3.8rem; float: left; } #search-field-small:not(:valid) ~ .clear-search { @@ -41,7 +41,7 @@ button.clear-search { position: absolute; text-align: right; right: 7rem; - top: .8rem; + top: .7rem; color: $gray-dark; font-size: 2.4rem; } @@ -107,9 +107,6 @@ button.clear-search:hover { .pac-item { padding-left: .25rem; } - .usa-menu-btn { - display: none; - } button.clear-search { right: 5.6rem; } diff --git a/app/assets/stylesheets/_map_sidebar.scss b/app/assets/stylesheets/_map_sidebar.scss index 515c7ece..6fffed1c 100644 --- a/app/assets/stylesheets/_map_sidebar.scss +++ b/app/assets/stylesheets/_map_sidebar.scss @@ -11,6 +11,7 @@ } #sidebar.on { right: 0; + transition-duration: 0ms; } #sidebar-button { position: absolute; @@ -28,31 +29,26 @@ .sidebar-card { position: relative; width: 90%; - min-height: 4em; margin: 1rem auto 1rem auto; - padding: 1.5rem 0 1.5rem 0; background-color: $white; box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.25); border-radius: 3px; display: table; } - .hubzone-sidebar-cell { display: table-cell; + padding: 1.5rem 0 1.5rem 0; } - .hubzone-sidebar-row { display: table-row; } - .hubzone-sidebar-cell.text { padding-left: 3rem; + padding-right: 1rem; vertical-align: middle; } - .sidebar-card h2 { display: inline; - vertical-align: middle; top: 1rem; max-width: 11rem; margin: 0; @@ -62,7 +58,6 @@ font-weight: normal; color: $gray-dark; } - .sidebar-card h4 { display: inline; vertical-align: middle; @@ -86,13 +81,18 @@ font-size: 2.4rem; font-weight: normal; padding-left: 0.8rem; + padding-top: 0.3rem; +} +.hubzone-until-date { + float: left; + padding-left: 1rem; } .qualified-hubzone { background-color: $green-light; color: $white; } .non-qualified-hubzone { - background-color: $gray-dark; + background-color: $gray; color: $white; } .hubzone-status-indicator .fa.fa-times-circle-o, .fa.fa-check-circle-o { @@ -100,20 +100,20 @@ font-size: 4rem; } .sidebar-qualifications { - width: 90%; - min-width: auto; - margin: 0 auto; - border-radius: 3px; - box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.25); - border-collapse: separate; - overflow: hidden; + margin: 0; +} +.qualification-label-wrapper { + vertical-align: middle; + display: table-cell; + width: 100%; + padding-left: 1rem; } -table.sidebar-qualifications th { +table th { border: none; } .sidebar-qualifications thead th { border: none; - padding: 1rem 1.5rem 1rem 1.5rem; + border-radius: 3px; } .sidebar-qualifications tbody th { background-color: $white; @@ -122,11 +122,28 @@ table.sidebar-qualifications th { font-size: 1.5rem; font-weight: 400; } -.sidebar-qualifications th > span { +.qualification-label-wrapper > span { float: none; font-weight: bold; } -.sidebar-qualifications tfoot tr td { +.sidebar-additional-details { + margin: 0; +} +.sidebar-additional-details thead th { + border: none; + border-radius: 3px; +} +.sidebar-additional-details tbody th { + background-color: $white; + border-top: 1px solid $gray-lightest; + color: $gray-dark; + font-size: 1.5rem; + font-weight: 400; + padding: 0; + display: table; + width: 100%; +} +.additional-details tfoot tr td { border-left: 1px solid $gray-lightest; border-right: 1px solid $gray-lightest; border-bottom: 1px solid $gray-lightest; @@ -134,10 +151,9 @@ table.sidebar-qualifications th { border-radius: 0 0 3px 3px; font-size: 1.5rem; } -.hubzone-status-date { - font-weight: normal; - font-size: 1.3rem; - padding-left: 2px; +th.additional-details-title { + background-color: $white; + color: $gray-dark; } i.fa.fa-print { font-size: 2.5rem; @@ -157,8 +173,8 @@ i.fa-file-pdf-o { display: none; } button#map-report { - background: none; - margin: 0.5rem 0.5rem .5rem 1.5rem; + background-color: $white; + margin: 1.7rem 0.5rem 1.5rem 1.5rem; padding: 0rem; } .create-report { @@ -167,62 +183,102 @@ button#map-report { padding-top: 0.5rem; color: $gray-dark; } +.sidebar-footer { + width: 34rem; + position: fixed; + bottom: 0; + background-color: $white; +} +.hubzone-status-date { + position: absolute; + bottom: 0px; + padding-top: 0.4rem; + padding-bottom: 0.4rem; + margin: 1.5rem 1.5rem 0.5rem 1.5rem; + text-align: center; + font-weight: normal; + font-size: 1.3rem; + color: #5b616b; +} +.sidebar-layer-symbol { + background-repeat: repeat; + background-size: 1.75rem; + width: 4rem; + height: 6rem; + float: left; +} @media only screen and (max-width: 950px) { #sidebar-button { display: none; } #sidebar { + position: fixed; + bottom: 0; width: 100%; - height: auto; - top: 100%; - background-color: transparent; + height: 12rem; + overflow: scroll; + box-shadow: 0px 0px 3px 2px rgba(0,0,0,0.2); + background-color: rgba(255,255,255,0.85); } - - #sidebar-content.zero-results { - margin-top: 0; - position: absolute; - bottom: 0px; + .sidebar-card { + display: block; + width: calc(100% - 2rem); + margin: 0.75rem 1rem; } - - #sidebar-content { - margin-top: -100px; + .hubzone-sidebar-cell{ + padding: 0.5rem 0 0.5rem 0; } - .sidebar-card.search-result { - min-height: 5.1rem; + .hubzone-status-date { + display: none; } - .sidebar-card { - width: 100%; - border-radius: 0; - margin: 0; - padding: 0.5rem; - min-height: auto; + .sidebar-card h2 { + font-size: 1.7rem; + line-height: 0rem; } - .sidebar-qualifications { - width: 100%; - border: none; - border-radius: 0; + .hubzone-until-date { + clear: left; + margin-top: -0.8rem; + padding-top: 0; + padding-left: 3rem; } - .sidebar-card > h2 { - font-size: 1em; - width: 100%; - padding-left: 3.3rem; + .sidebar-qualifications thead th { + font-size: 1.5rem; + padding: 0.25rem 1.6rem; } - .sidebar-card .fa.fa-map-marker { - font-size: 3.5rem; + #hubzone-qualifications:focus { + outline: none; } - .sidebar-qualifications thead th { - padding: 0.5rem 1.5rem 0.5rem 2rem; + #hubzone-status { + float: left; + font-size: 1.7rem; + padding-left: 0.5rem; } .hubzone-status-indicator .fa.fa-times-circle-o, .fa.fa-check-circle-o { - font-size: 3.5rem; + font-size: 2.8rem; } - #hubzone-status { - font-size: 1em; + .sidebar-additional-details thead th { + padding: 1rem; + font-size: 1.5rem; + } + .sidebar-layer-symbol { + width: 3rem; + height: 5rem; + } + .sidebar-card .fa.fa-map-marker { + font-size: 2.8rem; + } + i.fa-file-pdf-o { + float: left; + margin-right: 1rem; } button#map-report { - text-align: left; - margin: .5rem 0 .5rem 2rem; - cursor: pointer; + background-color: $white; + float: none; + margin: 0; + padding: 1rem 0.5rem 1rem 1.5rem; + } + .create-report { + float: left; } } diff --git a/app/assets/stylesheets/help.scss b/app/assets/stylesheets/help.scss new file mode 100644 index 00000000..6cdc9a51 --- /dev/null +++ b/app/assets/stylesheets/help.scss @@ -0,0 +1,103 @@ +// Place all the styles related to the Help controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +@import "variables"; + +#hubzone-map-guide { + padding-top: 2rem; + padding-left: 0; + margin-left: 1.5rem; + margin-right: 1.5rem; + color: $gray-dark; +} +#hubzone-map-guide h1,h2,h3,h4,h5,h6 { + font-family: $font-sans; +} +#hubzone-map-guide p { + max-width: inherit; +} +#hubzone-map-guide ul { + list-style-type: none; +} +.usa-layout-docs { + flex-direction: inherit; +} +.usa-layout-docs-sidenav { + order: 1; + margin-top: 0; + margin-bottom: 5rem; +} +.usa-layout-docs-faq { + order: 2; +} +.usa-layout-docs-main_content { + order: 2; +} +.usa-font-lead { + font-family: $font-sans; +} +.map-guide-header { + max-width: 100%; + padding: 2rem 0; + border-bottom: 2px solid $gray-lighter; +} +.return-to-map { + margin-left: 1.5rem; +} +.return-to-map i { + margin-right: 1rem; + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + -webkit-transform: scaleX(-1); + transform: scaleX(-1); + filter: FlipH; + -ms-filter: "FlipH"; +} +.help-nav { + position: sticky; + position: -webkit-sticky; + top: 2rem; +} +.help-nav a:focus{ + box-shadow: none; +} +.help-layer-symbols { + background-repeat: repeat; + background-size: 1rem; + width: 3rem; + height: 3rem; + display: inline-block; + margin-right: 1rem; + vertical-align: middle; +} +.return-to-top { + position: relative; + top: 3rem; +} +@media only screen and (max-width: 950px) { + #hubzone-map-guide { + padding-top: 0; + margin-left: 1rem; + margin-right: 1rem; + } + #hubzone-map-guide h1 { + margin-top: 0; + } + .usa-layout-docs { + flex-direction: column; + } + .usa-layout-docs-sidenav { + order: 1; + } + .help-nav { + position: relative; + } + .map-guide-header { + border-bottom: none; + padding-bottom: 0.5rem; + } + .return-to-map { + margin-left: 1rem; + } +} diff --git a/app/assets/stylesheets/map.scss b/app/assets/stylesheets/map.scss index 94d49139..eab525d1 100644 --- a/app/assets/stylesheets/map.scss +++ b/app/assets/stylesheets/map.scss @@ -1,6 +1,7 @@ // Globals & Variables @import 'variables'; @import 'globals'; +@import 'layers'; // Partials @import 'map_header'; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1157e883..68820058 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,6 +5,12 @@ class ApplicationController < ActionController::Base before_action :set_locale def set_locale - I18n.locale = params[:locale] || I18n.default_locale + return I18n.locale = I18n.default_locale if params[:locale].nil? + locales = I18n.available_locales + I18n.locale = if locales.include? params[:locale].to_sym + params[:locale] + else + I18n.default_locale + end end end diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb new file mode 100644 index 00000000..b208cb20 --- /dev/null +++ b/app/controllers/help_controller.rb @@ -0,0 +1,6 @@ +# Provides access to the help page with the HUBZone map +class HelpController < ApplicationController + def index + @page_selected = params[:page] + end +end diff --git a/app/controllers/map_controller.rb b/app/controllers/map_controller.rb index be7118bf..a500ac62 100644 --- a/app/controllers/map_controller.rb +++ b/app/controllers/map_controller.rb @@ -9,8 +9,7 @@ def index def search query = format_query params path = "#{MAP_CONFIG[:hubzone_api_search_path]}?#{query}" - response = connection.request(method: :get, - path: path) + response = api_get path @body = response.data[:body] respond_to do |format| format.js {} @@ -36,7 +35,14 @@ def parse_search_query(params) private + def api_get(path) + version = MAP_CONFIG[:hubzone_api_version] + connection.request(method: :get, + path: path, + headers: { 'Accept' => "application/sba.hubzone-api.v#{version}" }) + end + def connection - Excon.new(MAP_CONFIG[:hubzone_api_host]) + @connection ||= Excon.new(MAP_CONFIG[:hubzone_api_host]) end end diff --git a/app/views/map/_map_header.html.erb b/app/views/application/_header.html.erb similarity index 86% rename from app/views/map/_map_header.html.erb rename to app/views/application/_header.html.erb index 101cde72..ed94f7fd 100644 --- a/app/views/map/_map_header.html.erb +++ b/app/views/application/_header.html.erb @@ -10,7 +10,7 @@
    - + +
    + + + + + +
    - - - - - - - <%= render partial: "qualification", collection: hubzones %> - - +
    + + + + + + <%= render partial: "qualification", collection: hubzones %> + +
    <%= t('sidebar.details.title') %>
    + +
    -
    +
    + +
    + <%= t('hubzone_assertions.qualifications_effective') %><%= date %> +
    diff --git a/app/views/map/_qualification.html.erb b/app/views/map/_qualification.html.erb index 978a6109..b3e12d7b 100644 --- a/app/views/map/_qualification.html.erb +++ b/app/views/map/_qualification.html.erb @@ -5,9 +5,14 @@ %> -
    <%= t(('hubzone_assertions.' + qualification["hz_type"]).to_s) %>
    - <% unless qualification["expires"].nil? %> - <%= t('hubzone_assertions.' + expires_text) %> <%= qualification["expires"].to_s %> - <% end %> +
    ">
    +
    +
    + <%= t(('hubzone_assertions.' + qualification["hz_type"]).to_s) %> +
    + <% unless qualification["expires"].nil? %> + <%= t('hubzone_assertions.' + expires_text) %> <%= I18n.l Date.parse(qualification["expires"]), format: :full %> + <% end %> +
    diff --git a/config/database.yml b/config/database.yml index 92aa2dca..d83ddf34 100644 --- a/config/database.yml +++ b/config/database.yml @@ -27,21 +27,22 @@ default: &default production: <<: *default database: <%= ENV.fetch('HUBZONE_MAP_DB_NAME') { 'hzmap_prd' } %> + host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db.maps.certify.sba.gov' } %> staging: <<: *default database: <%= ENV.fetch('HUBZONE_MAP_DB_NAME') { 'hzmap_stg' } %> - host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'hz-hzstg.cyy8xym5djtg.us-east-1.rds.amazonaws.com' } %> + host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db.maps.staging.certify.sba.gov' } %> demo: <<: *default database: <%= ENV.fetch('HUBZONE_MAP_DB_NAME') { 'hzmap_demo' } %> - host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db1.map.dev.sba-one.net' } %> + host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db.hz-demo.sba-one.net' } %> dev: <<: *default database: <%= ENV.fetch('HUBZONE_MAP_DB_NAME') { 'hzmap_dev' } %> - host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db1.map.dev.sba-one.net' } %> + host: <%= ENV.fetch('HUBZONE_MAP_DB_HOST') { 'db.map.dev.sba-one.net' } %> development: <<: *default diff --git a/config/environments/production.rb b/config/environments/production.rb index 432d13e4..6e3aa8f5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -69,7 +69,8 @@ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true - + # Enable multiple locale files to be loaded + config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify diff --git a/config/locales/dev.yml b/config/locales/dev.yml index faa25327..c81f51cf 100644 --- a/config/locales/dev.yml +++ b/config/locales/dev.yml @@ -28,19 +28,24 @@ dev: month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] formats: - full: " %B %d %Y" + full: " %b %d, %Y" menu: hubzone_program: "Programa HUBZone" hubzone_program_aria_label: "Programa hubzone" accessible_version: "Versión accesible" help: "Ayuda" map: + aria_label: "Está mostrando un mapa a pantalla completa" enter_address: "Ingresa la direccion" filter: "Filtrar" search: label: "Mapa de HUBZone Search Buscar" sidebar: button: "Botón de la barra lateral" + print_version: "Versión imprimible" + until: "hasta" + details: + title: "Detalles adicionales" api: success: "Éxito" error: @@ -51,7 +56,7 @@ dev: unknown_error: "Lo sentimos. La solicitud ha fallado debido a un error interno. Vuelve a intentarlo." hubzone_assertions: qualified_by: "Calificado por: " - qualifications_effective: "A partir de" + qualifications_effective: "La calificación es válida para hoy: " qualified: "HUBZone Calificado" qualified_aria: "hubzone Calificado" qualified_short: "Calificado" @@ -62,7 +67,7 @@ dev: expires: "Caduca" qct: "Zona censal" qct_e: "Zona censal" - qct_b: "BRAC Zona censal" + qct_brac: "BRAC Zona censal" qct_r: "Rediseñado Zona censal" qnmc: "Condado" qnmc_a: "Condado" @@ -74,17 +79,29 @@ dev: qnmc_brac: "BRAC Condado" qnmc_r: "Rediseñado Condado" indian_lands: "Tierra Indígena" - brac: "rediseñado" - disaster_area: "Área de desastre" + brac: "Antigua base militare" + qct_qda: "Área de Desastre del Área de Censos" + qnmc_qda: "Área de desastre del condado" legend: title: "Leyenda" - aria_label: "Leyenda de hubzone" + qualified: "HUBZone Calificados" + expiring: "HUBZone caducando" qct: "Zona censal" + qnmc: "Condado" indian_lands: "Tierra Indígena" redesignated: "Rediseñado" - qnmc: "Condado" brac: "Antigua base militare" - brac_base: "Antigua base militare" + qda: "Área de desastre" + icon_census_tract: "Icono de la leyenda cuadrado azul oscuro" + icon_county: "Leyenda icono cuadrado rojo" + icon_indian_land: "Leyenda icono cuadrado azul brillante" + icon_redesignated_census: "Leyenda icono azul oscuro diagonal raya patrón" + icon_redesignated_county: "Icono de la leyenda patrón diagonal rojo de la raya" + icon_disaster_area_census: "Leyenda icono azul oscuro horizontal raya patrón" + icon_disaster_area_county: "Leyenda icono rojo horizontal raya patrón" + icon_brac_census: "Leyenda icono azul oscuro patrón punteado" + icon_brac_county: "Leyenda icono rojo punteado patrón" + icon_brac: "Leyenda icono negro punteado patrón" report: error: "Error al generar el informe" generating: "Generar informe..." diff --git a/config/locales/en.yml b/config/locales/en.yml index 06b0e0d5..cf3e1c25 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -28,19 +28,24 @@ en: month_names: [~, January, Febuary, March, April, May, June, July, August, September, October, November, December] abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec] formats: - full: " %B %d %Y" + full: " %b %d, %Y" menu: hubzone_program: "HUBZone Program" hubzone_program_aria_label: "hubzone program" accessible_version: "Accessible Version" help: "Help" map: + aria_label: "page is displaying a fullscreen map" enter_address: "Enter address" filter: "Filter" search: label: "hubzone map search" sidebar: button: "Sidebar Button" + print_version: "Printable Version" + until: "until" + details: + title: "Additional Details" api: success: "Success" error: @@ -51,7 +56,7 @@ en: unknown_error: "We're sorry. The request failed due to an internal error. Please try again." hubzone_assertions: qualified_by: "Qualified by: " - qualifications_effective: "As of" + qualifications_effective: "Qualification is valid for today: " qualified: "Qualified HUBZone" qualified_aria: "qualified hubzone" qualified_short: "Qualified" @@ -62,7 +67,7 @@ en: expired: "Expired" qct: "Census Tract" qct_e: "Census Tract" - qct_b: "Base Closure Census Tract" + qct_brac: "Base Closure Census Tract" qct_r: "Redesignated Census Tract" qnmc: "County" qnmc_a: "County" @@ -75,16 +80,28 @@ en: qnmc_r: "Redesignated County" indian_lands: "Indian Land" brac: "Base Closure" - disaster_area: "Disaster Area" + qct_qda: "Census Tract Disaster Area" + qnmc_qda: "County Disaster Area" legend: title: "Legend" - aria_label: "hubzone legend" + qualified: "Qualified HUBZones" + expiring: "Expiring HUBZones" qct: "Census Tract" + qnmc: "County" indian_lands: "Indian Land" redesignated: "Redesignated" - qnmc: "County" - brac: "Base Closure Area" - brac_base: "Closed Base" + brac: "Closed Base Area" + qda: "Disaster Area" + icon_census_tract: "legend icon dark blue square" + icon_county: "legend icon red square" + icon_indian_land: "legend icon bright blue square" + icon_redesignated_census: "legend icon dark blue diagonal stripe pattern" + icon_redesignated_county: "legend icon red diagonal stripe pattern" + icon_disaster_area_census: "legend icon dark blue horizontal stripe pattern" + icon_disaster_area_county: "legend icon red horizontal stripe pattern" + icon_brac_census: "legend icon dark blue dotted pattern" + icon_brac_county: "legend icon red dotted pattern" + icon_brac: "legend icon black dotted pattern" report: error: "Error Generating Report" generating: "Generating Report..." diff --git a/config/locales/help_dev.yml b/config/locales/help_dev.yml new file mode 100644 index 00000000..fcddc5ff --- /dev/null +++ b/config/locales/help_dev.yml @@ -0,0 +1,90 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +dev: + help: + back_to_map: "Volver al mapa" + return_to_top: "Volver a la cima" + overview: + title_html: "Mapa del HUBZone" + body_html: "La aplicación de mapeo de HUBZone le ayuda a averiguar si una ubicación particular de un negocio o una ubicación residencial de un empleado está dentro de una HUBZone. También puede utilizar HUBZone Mapping para averiguar qué áreas de HUBZone se encuentran dentro de un área de mayor interés." + elegibility: + title_html: "Determinación de elegibilidad" + body_html: "

    Puede utilizar el Mapa para determinar y documentar su elegibilidad para el programa de Zonas empresariales históricamente infrautilizadas (HUBZone) que ejecuta Small Business Administration (SBA). Para una explicación más detallada del Programa HUBZone y los criterios de elegibilidad,HUBZone Program Sección de información.

    Para determinar la elegibilidad de un negocio o residencia, siga estos pasos:

    1. Escriba la dirección en la barra de búsqueda y haga clic o toque Buscar
    2. Asegúrese de que la búsqueda encontró la dirección correcta
    3. Leer el estado de calificación
    4. Abrir una copia imprimible de los resultados
    " + reporting: + title_html: "Proporcionar documentación a la SBA" + body_html: "

    Después de encontrar la dirección de su negocio o residencia (see Determinación de elegibilidad),Seleccione el botón Versión imprimible para crear una copia PDF del mapa. El PDF se abrirá en una nueva ventana del navegador. Compruebe que el PDF muestra la dirección exacta para el negocio o la residencia (las búsquedas genéricas como \"Greenville, SC\" no cuentan). Esta dirección debe coincidir con la dirección en su prueba de residencia / documento de propiedad. A continuación, puede descargar o imprimir el PDF.

    Puede enviar estas copias PDF a la SBA con su aplicación HUBZone a través del sistema de seguimiento de certificación HUBZone (HCTS) https://eweb.sba.gov/

    " + understanding: + title_html: "Entendiendo el mapa" + search_bar: + title_html: "Barra de búsqueda" + body_html: "

    Puede buscar una dirección o una coordenada GPS en el Mapa usando la barra de búsqueda. Cuando empiece a escribir la dirección en la barra de búsqueda, pueden aparecer sugerencias. Puede seleccionar cualquiera de las direcciones sugeridas o continuar introduciendo la dirección. Pulse \"Enter\" o seleccione la lupa para buscar. Puede borrar el campo de búsqueda para introducir una nueva dirección seleccionando el símbolo \"x\".

    Si desea buscar una coordenada GPS específica, utilice el formato: 38.93655, -77.01993. Siempre indique latitud y longitud. No utilice el símbolo \"°\". Asegúrese de usar el símbolo \"-\" para indicar coordenadas GPS negativas.

    " + legend: + title_html: "Leyenda" + overview_html: "

    The Legend es una guía visual que le ayuda a leer la información mostrada en el mapa. El mapa muestra áreas designadas como HUBZones usando colores y patrones. Cada HUBZone o HUBZone expirante tiene un símbolo diferente en la Leyenda.

    " + census_tract: + title_html: "Tramo de Censo
    " + body_html: "HUBZone Census Calified Tracts designado por el Departamento de Vivienda y Desarrollo Urbano (HUD) basado en criterios de pobreza y ingreso familiar." + county: + title_html: "Condado
    " + body_html: "HUBZone Condados calificados ubicados en áreas no metropolitanas que reúnan al menos dos de los criterios socioeconómicos: ingreso familiar (Oficina del Censo), tasa de desempleo (Oficina de Estadísticas Laborales) y áreas de desarrollo difícil (Departamento de Vivienda y Desarrollo Urbano)." + indian_land: + title_html: "Tierra india
    " + body_html: "HUBZone Territorios Indios Calificados incluidos dentro de los límites de una Reserva Indígena, País Indio o cualquier otra definición específica que se aplique en el Estado de Oklahoma." + redesignated_area: + title_html: "Área Redesignada
    " + body_html: "HUBZone Census Tracts calificados y HUBZone condados calificados pueden perder su condición de calificación HUBZone. Cuando eso suceda, el Departamento de Censo o Condado permanecerá calificado por tres años después de la fecha de la Re-designación. Las áreas rediseñadas siempre muestran una fecha de vencimiento junto a su estado de calificación.
    • Sector de Censo Rediseñado
    • Condado rediseñado
    " + disaster_area: + title_html: "
    Área de desastre" + body_html: "

    Un Área de Desastre Calificado de HUBZone incluye las Regiones Censitarias y Condados que el Presidente declaró áreas de desastre importantes o catastróficas.

    Para que un Tramo de Censo o Condado sea designado como un Área de Desastre Calificada, debe haberse convertido en un Área de Censo Redesignada o en un Condado Rediseñado dentro del período que comienza 5 años antes de la fecha de la declaración de desastre y terminando 2 años después de dicha fecha.

    La calificación de un Área de Desastre comienza en la fecha de la declaración de desastre o en la fecha en que termina su Redesignación, la que sea más reciente. Dependiendo de la categoría de desastre, un Área de Desastre permanece calificado por 5 años si se considera un desastre mayor o 10 años si se considera un desastre catastrófico.

    • Área de desastre Área censal
    • Condado de Disaster Area
    " + base_closure_area: + title_html: "Área de cierre de la base
    " + body_html: "

    HUBZone Zona de Cierre Calificado de Áreas contenidas dentro de los límites de una instalación militar del Departamento de Defensa (DoD) cerrada. Un área de cierre de base permanecerá calificada durante 8 años después de que se designe como HUBZone. Las áreas de cierre de base siempre muestran una fecha de vencimiento junto a su estado de calificación.

    • Cierre de la base

      • Límites de una instalación militar cerrada.

    • Censo de la Base

      HUBZone Redesignado o No Censado que contiene una instalación militar o contigua a la que contiene una instalación militar.

    • Condado de cierre de base

      HUBZone Condado rediseñado o no calificado que contenga una instalación militar o contigua a la que contenga una instalación militar.

    " + advanced: + title_html: "Uso de funciones avanzadas" + base_map: + title_html: "Toggle del mapa base" + body_html: "

    Utilice los botones del mapa base para cambiar el mapa base. Cada mapa base muestra una vista diferente de la información para ayudarle a navegar por el mapa y encontrar puntos de referencia. losMapa Base es el mapa predeterminado proporcionado por Google, incluyendo la mayoría de las calles, lugares de interés y negocios. losLight Gray Mapa base muestra una vista menos desordenada de los hitos circundantes y puede ayudar a aclarar las diferencias en las capas HUBZone. losHybrid El mapa base muestra una vista de satélite del terreno y si se amplía lo suficiente la El mapa cambiará a una vista en perspectiva 3D de edificios y puntos de referencia.

    " + zoom: + title_html: "Enfocar" + body_html: "

    Utilice los botones + y - para acercar y alejar el mapa. Cada vez que haga clic o toque el botón + o -, la pantalla ampliará la escala del mapa. En los dispositivos móviles también puede utilizar pinch-to-zoom.

    " + street_view: + title_html: "vista de calle" + body_html: "

    Utilice el icono pegman (izquierda) para ver una vista de nivel de calle del mapa. Puede hacer clic y arrastrar el icono a la ubicación que desea ver a nivel de la calle. A continuación, puede utilizar las flechas de la pantalla para moverse a nivel de la calle. Para salir del zoom de la vista de la calle o haga clic en la flecha hacia atrás en la parte superior izquierda debajo de la barra de búsqueda.

    " + my_location: + title_html: "Mi ubicacion" + body_html: "

    Puede permitir que el Mapa utilice su ubicación actual. Al permitir que su ubicación centre el Mapa en su ubicación actual y muestre un punto negro en el Mapa. Luego, si mueve el Mapa, puede usar el ícono de flecha (izquierda) para restablecer el Mapa a su ubicación.

    " + faq: + title: "preguntas frecuentes" + question_one: + title_html: "¿Qué pasa si el mapa no puede completar mi búsqueda?" + body_first_html: "

    El Mapa HUBZone siempre intentará encontrar y colocar un marcador para la dirección que ingresa. Si el Mapa HUBZone no puede completar su búsqueda, mostrará el siguiente mensaje de error:

    " + body_second_html: "

    Hay varias razones por las que podría recibir este mensaje de error.

    1. La dirección es incorrecta, inténtalo de nuevo
    2. La búsqueda está teniendo problemas para encontrar la dirección exacta, intente ingresar sólo la dirección de la calle y deje que la barra de búsqueda complete la dirección para usted
    3. La dirección no existe o no tiene una ubicación geocodificada, ver más abajo

    Si el Mapa no devuelve una dirección, puede hacer clic o tocar en el Mapa para colocar un marcador en la ubicación correcta. Tenga en cuenta que al utilizar este método sólo se devolverán coordenadas GPS para la ubicación.

    " + question_two: + title_html: "¿Qué pasa si el mapa coloca el marcador en el lugar equivocado?" + body_html: "A veces, el Mapa puede colocar incorrectamente el marcador de ubicación, especialmente en lugares donde se dispone de menos datos de geocodificación, como Puerto Rico. Si cree que el marcador de mapa no está colocado correctamente, puede hacer clic o tocar el Mapa para colocar un marcador en la ubicación correcta. Tenga en cuenta que al utilizar este método sólo se devolverán coordenadas GPS para la ubicación." + question_three: + title_html: "¿Qué pasa si mi ubicación no tiene una dirección?" + body_html: "

    Si conoce las coordenadas GPS de la ubicación, puede escribirlas en la barra de búsqueda. Utilice el formato: 38.93655, -77.01993. Siempre elija la latitud primero, la longitud segundo y no use el símbolo \"°\". Asegúrese de usar el símbolo \"-\" para indicar coordenadas GPS negativas.

    Si su ubicación no tiene una dirección y no conoce las coordenadas GPS, puede hacer clic o tocar en el Mapa para colocar un marcador En la ubicación correcta. Tenga en cuenta que el uso de este método devolverá las coordenadas GPS de la ubicación y no una dirección.

    " + question_four: + title_html: "¿Por qué mi dirección tiene una fecha de caducidad?" + body_first_html: "

    Si su dirección se encuentra en un HUBZone rediseñado o área de cierre de base, mostrará una fecha de vencimiento bajo el estado de calificación. Si ve una fecha de vencimiento, significa que la ubicación está actualmente calificada para el programa HUBZone, pero ya no se calificará después de la fecha de caducidad.

    " + body_second_html: "

    Si ve varias fechas de vencimiento en la sección de detalles adicionales, la dirección se encuentra en múltiples HUBZones superpuestas. Cada tipo de HUBZone tiene sus propias reglas de calificación y caducidad. Debe utilizar la fecha más lejana (la fecha que se muestra justo debajo del estado de calificación) como la fecha en que la dirección ya no estará calificada para el Programa HUBZone.

    " diff --git a/config/locales/help_en.yml b/config/locales/help_en.yml new file mode 100644 index 00000000..79e3ad1e --- /dev/null +++ b/config/locales/help_en.yml @@ -0,0 +1,90 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + help: + back_to_map: "Back to map" + return_to_top: "Return to top" + overview: + title_html: "HUBZone Map Overview" + body_html: "The HUBZone Mapping Application assists you in finding out whether or not a particular business location or employee residential location is within a HUBZone. You can also use HUBZone Mapping to find out what HUBZone areas are found within a larger area of interest." + elegibility: + title_html: "Determining eligibility" + body_html: "

    You can use the Map to determine and document your eligibility for the Historically Underutilized Business Zones (HUBZone) Program run by the Small Business Administration (SBA). For a more detailed explanation of the HUBZone Program and the eligibility criteria, see the general HUBZone Program information section.

    To determine the eligibility of a business or residence, follow these steps:

    1. Type the address into the search bar and click or tap search
    2. Check to make sure the search found the right address
    3. Read the qualification status
    4. Open a printable copy of the results
    " + reporting: + title_html: "Providing documentation to SBA" + body_html: "

    After you find the address for your business or residence (see Determining Eligibility), select the Printable Version button to create a PDF copy of the map. The PDF will open in a new browser window. Check to make sure that the PDF shows the exact street address for the business or residence (generic searches like \"Greenville, SC\" don't count). This address must match the address on your proof of residency/ownership document. You can then download or print the PDF.

    You can send these PDF copies to the SBA with your HUBZone application through the HUBZone Certification Tracking System (HCTS) https://eweb.sba.gov/

    " + understanding: + title_html: "Understanding the Map" + search_bar: + title_html: "Search Bar" + body_html: "

    You can search for an address or a GPS coordinate on the Map using the search bar. When you start to type the address into the search bar, suggestions might appear. You can select any of the suggested addresses or continue entering the address. Press \"Enter\" or select the magnifying glass to search. You can clear the search field to enter a new address by selecting the \"x\" symbol.

    If you would like to search for a specific GPS coordinate, use the format: 38.93655, -77.01993. Always list latitude then longitude. Do not use the degree \"°\" symbol. Make sure to use the \"-\" symbol to indicate negative GPS coordinates.

    " + legend: + title_html: "Legend" + overview_html: "

    The Legend is a visual guide that helps you read the information shown on the map. The Map shows areas designated as HUBZones using colors and patterns. Each HUBZone or Expiring HUBZone has a different symbol in the Legend.

    " + census_tract: + title_html: "
    Census Tract" + body_html: "HUBZone Qualified Census Tracts designated by the Department of Housing and Urban Development (HUD) based on poverty and household income criteria." + county: + title_html: "
    County" + body_html: "HUBZone Qualified Counties located in non-metropolitan areas that meet at least two of the socio-economic criteria: household income (Census Bureau), unemployment rate (Bureau of Labor Statistics), and difficult development areas (Department of Housing and Urban Development)." + indian_land: + title_html: "
    Indian Land" + body_html: "HUBZone Qualified Indian Lands contained within the boundaries of an Indian Reservation, Indian Country, or any other specific definition that applies in the State of Oklahoma." + redesignated_area: + title_html: "
    Redesignated Area" + body_html: "HUBZone Qualified Census Tracts and HUBZone Qualified Counties can lose their HUBZone qualification status. When that happens, the Census Tract or County will remain qualified for three years after the date of Redesignation. Redesignated Areas always show an expiration date next to their qualification status.
    • Redesignated Census Tract
    • Redesignated County
    " + disaster_area: + title_html: "
    Disaster Area" + body_html: "

    A HUBZone Qualified Disaster Area includes the Census Tracts and Counties the President declared major or catastrophic disaster areas.

    For a Census Tract or County to be designated as a Qualified Disaster Area, it must have become a Redesignated Census Tract or Redesignated County within the period beginning 5 years before the disaster declaration date and ending 2 years after such date.

    A Disaster Area's qualification starts on the date of the disaster declaration or the date in which its Redesignation ends, whichever is more recent. Depending on the disaster category, a Disaster Area remains qualified for 5 years if considered a major disaster or 10 years if considered a catastrophic disaster.

    • Disaster Area Census Tract
    • Disaster Area County
    " + base_closure_area: + title_html: "
    Base Closure Area" + body_html: "

    HUBZone Qualified Base Closure Areas contained within the boundaries of a closed Department of Defense (DoD) military installation. A Base Closure Area will remain qualified for 8 years after it is designated as a HUBZone. Base Closure Areas always show an expiration date next to their qualification status.

    • Base Closure

      • Boundaries of a closed military installation.

    • Base Closure Census Tract

      HUBZone Redesignated or Non-Qualified Census Tract containing a military installation or contiguous to the one containing a military installation.

    • Base Closure County

      HUBZone Redesignated or Non-Qualified County containing a military installation or contiguous to the one containing a military installation.

    " + advanced: + title_html: "Using advanced Features" + base_map: + title_html: "Base Map Toggle" + body_html: "

    Use the base map buttons to change the base map. Each base map shows a different view of the information to help you navigate the map and find landmarks. The Map base is the default map provided by Google including most streets, landmarks, and businesses. The Gray base map shows a less cluttered view of the surrounding landmarks and may help clarify differences in the HUBZone layers. The Hybrid base map shows a satellite view of the terrain and if you zoom in far enough the map will switch to a 3D perspective view of buildings and landmarks.

    " + zoom: + title_html: "Zoom" + body_html: "

    Use + and - buttons to zoom in and out on the map. Each time you click or tap the + or - button, the screen will magnify the scale of the map. On mobile devices you can also use pinch-to-zoom.

    " + street_view: + title_html: "Street View" + body_html: "

    Use the pegman icon(left) to see a street level view of the map. You can click and drag the icon to the location you would like to see at street level. You can then use the arrows on your screen to move around at street level. To exit street view zoom out or click the back arrow in the top left under the search bar.

    " + my_location: + title_html: "My Location" + body_html: "

    You can allow the Map to use your current location. Allowing your location centers the Map on your current location and shows a black dot on the Map. Then, if you move the Map you can use the arrow icon(left) to reset the Map to your location.

    " + faq: + title: "Frequently Asked Questions" + question_one: + title_html: "What if the map can't complete my search?" + body_first_html: "

    The HUBZone Map will always try to find and place a marker for the address you input. If the HUBZone Map cannot complete your search it will display the following error message:

    " + body_second_html: "

    There are several reasons you might get this error message.

    1. The address is incorrect, try entering it again
    2. The search is having trouble finding the exact address, try entering just the street address and let the search bar complete the address for you
    3. The address does not exist or does not have a geocoded location, see below

    If the Map does not return an address you can click or tap the Map to place a marker in the correct location. Please be aware that using this method will return only GPS coordinates for the location.

    " + question_two: + title_html: "What if the map places the marker in the wrong place?" + body_html: "Sometimes the Map may place the location marker incorrectly, especially in places where less geocoding data is available, like Puerto Rico. If you believe the map marker is not placed correctly, you can click or tap the Map to place a marker in the correct location. Please be aware that using this method will return only GPS coordinates for the location." + question_three: + title_html: "What if my location does not have an address?" + body_html: "

    If you know the GPS coordinates for the location, you can type them into the search bar. Use the format: 38.93655, -77.01993. Always list latitude first, longitude second and do not use the degree \"°\" symbol. Make sure to use the \"-\" symbol to indicate negative GPS coordinates.

    If your location does not have an address and you do not know the GPS coordinates, you can click or tap the Map to place a marker in the correct location. Please be aware that using this method will return GPS coordinates for the location and not a street address.

    " + question_four: + title_html: "Why does my address have an expiration date?" + body_first_html: "

    If your address is located in a Redesignated HUBZone or Base Closure Area, it will show an expiration date under the qualification status. If you see an expiration date, it means that the location is currently qualified for the HUBZone program, but it will no longer be qualified after the expiration date.

    " + body_second_html: "

    If you see multiple expiration dates in the additional details section the address is located in multiple overlapping HUBZones. Each type of HUBZone has its own qualification and expiration rules. You should use the more distant date (the date that is shown right under the qualification status) as the date when the address will no longer be qualified for the HUBZone Program.

    " diff --git a/config/map.yml b/config/map.yml index ceb0c1cf..ca520cfd 100644 --- a/config/map.yml +++ b/config/map.yml @@ -1,13 +1,14 @@ default: &defaults hubzone_map_host: <%= ENV.fetch('HUBZONE_MAP_HOST') { 'http://localhost:3001' } %> hubzone_api_host: <%= ENV.fetch('HUBZONE_API_HOST') { 'http://localhost:3001' } %> + hubzone_api_version: 1 hubzone_api_search_path: '/api/search' hubzone_report_host: <%= ENV.fetch('HUBZONE_REPORT_API_HOST') { 'http://localhost:3002' } %> hubzone_api_report_path: '/report' hubzone_report_request_type: <%= ENV.fetch('HUBZONE_REPORT_REQUEST_TYPE') { 'window_open' } %> google_api_key: <%= ENV.fetch('HUBZONE_GOOGLE_API_KEY') { 'AIzaSyBsR78bM2H5vMlO60MAtaL9FVtPGWGyQ7c' } %> google_analytics_tracking_id: <%= ENV.fetch('GOOGLE_ANALYTICS_TRACKING_ID') { 'UA-89111383-1' } %> - hotjar_tracking_id: <%= ENV.fetch('HUBZONE_HOTJAR_TRACKING_ID') { '' } %> + hotjar_tracking_id: <%= ENV.fetch('HUBZONE_HOTJAR_TRACKING_ID') { '475456' } %> geom_wms_settings: &default_wms url_root: <%= ENV.fetch('HUBZONE_WMS_URL_ROOT') { 'http://localhost:8080/geoserver/gwc/service/wms?' } %> workspace: <%= ENV.fetch('HUBZONE_WMS_WORKSPACE') { 'hubzone' } %> @@ -17,20 +18,25 @@ default: &defaults production: <<: *defaults + hubzone_map_host: <%= ENV.fetch('HUBZONE_MAP_HOST') { 'https://maps.certify.sba.gov/' } %> + hubzone_api_host: <%= ENV.fetch('HUBZONE_API_HOST') { 'https://maps.certify.sba.gov' } %> + hubzone_report_host: <%= ENV.fetch('HUBZONE_REPORT_HOST') { 'https://maps.certify.sba.gov' } %> + hotjar_tracking_id: <%= ENV.fetch('HUBZONE_HOTJAR_TRACKING_ID') { '475424' } %> google_analytics_tracking_id: <%= ENV.fetch('GOOGLE_ANALYTICS_TRACKING_ID') { 'UA-19362636-24' } %> geom_wms_settings: <<: *default_wms + url_root: <%= ENV.fetch('HUBZONE_WMS_URL_ROOT') { 'https://maps.certify.sba.gov/geoserver/gwc/service/wms?' } %> db: hzgeo_prd staging: <<: *defaults - hubzone_map_host: <%= ENV.fetch('HUBZONE_MAP_HOST') { 'http://maps.staging.certify.sba.gov/' } %> - hubzone_api_host: <%= ENV.fetch('HUBZONE_API_HOST') { 'http://maps.staging.certify.sba.gov' } %> - hubzone_report_host: <%= ENV.fetch('HUBZONE_REPORT_HOST') { 'http://maps.staging.certify.sba.gov' } %> + hubzone_map_host: <%= ENV.fetch('HUBZONE_MAP_HOST') { 'https://maps.staging.certify.sba.gov/' } %> + hubzone_api_host: <%= ENV.fetch('HUBZONE_API_HOST') { 'https://maps.staging.certify.sba.gov' } %> + hubzone_report_host: <%= ENV.fetch('HUBZONE_REPORT_HOST') { 'https://maps.staging.certify.sba.gov' } %> hotjar_tracking_id: <%= ENV.fetch('HUBZONE_HOTJAR_TRACKING_ID') { '435148' } %> geom_wms_settings: <<: *default_wms - url_root: <%= ENV.fetch('HUBZONE_WMS_URL_ROOT') { 'http://maps.staging.certify.sba.gov/geoserver/gwc/service/wms?' } %> + url_root: <%= ENV.fetch('HUBZONE_WMS_URL_ROOT') { 'https://maps.staging.certify.sba.gov/geoserver/gwc/service/wms?' } %> db: hzgeo_stg demo: diff --git a/config/routes.rb b/config/routes.rb index 8e607d4e..c7b98868 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,14 +2,17 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root to: 'main#index' + get '/map', to: 'main#index', as: :old_map mount JasmineRails::Engine => '/specs' if defined?(JasmineRails) - app_scope = Rails.env.production? ? '/hubzone/map' : '/map' + app_scope = '/hubzone/map' scope app_scope do get 'search', to: 'map#search' get 'translate', to: 'map#translate' + get 'help', to: 'help#index', page: 'overview' + get 'help/faq', to: 'help#index', page: 'faq' get 'aws-hc', to: 'health_check#status' get 'report', to: 'report#report' get '/', to: 'map#index', as: :map diff --git a/example.env b/example.env index 3f45c1da..2539e897 100644 --- a/example.env +++ b/example.env @@ -34,6 +34,10 @@ HUBZONE_MAP_DB_PASSWORD= HUBZONE_GOOGLE_API_KEY='AIzaSyBsR78bM2H5vMlO60MAtaL9FVtPGWGyQ7c' # Doug's HUBZONE_GOOGLE_ANALYTICS_TRACKING_ID='UA-89111383-1' # Doug's +# Hotjar Key ------------------------------------------------------------------- + +HUBZONE_HOTJAR_TRACKING_ID='475456' #localhost + # *OPTIONAL* HUBZone Override Settings ------------------------------------------- # These vars are set in either database.yml or map.yml and should work for diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb new file mode 100644 index 00000000..7d918285 --- /dev/null +++ b/spec/controllers/help_controller_spec.rb @@ -0,0 +1,4 @@ +require 'rails_helper' + +RSpec.describe HelpController, type: :controller do +end diff --git a/spec/controllers/main_controller_spec.rb b/spec/controllers/main_controller_spec.rb index 0913d597..06a5d548 100644 --- a/spec/controllers/main_controller_spec.rb +++ b/spec/controllers/main_controller_spec.rb @@ -1,5 +1,6 @@ require "rails_helper" +# rubocop:disable Metrics/BlockLength RSpec.describe MainController do describe "root path" do before do @@ -12,4 +13,38 @@ expect(subject).to redirect_to(url) end end + describe 'GET with a locale' do + context 'when given the dev locale' do + before do + get :index, params: { locale: :dev } + end + it 'should set to the dev locale' do + expect(I18n.locale).to eql(:dev) + end + end + context 'when given the en locale' do + before do + get :index, params: { locale: :en } + end + it 'should set to the dev locale' do + expect(I18n.locale).to eql(:en) + end + end + context 'when given no locale' do + before do + get :index + end + it 'should set to the default locale' do + expect(I18n.locale).to eql(I18n.default_locale) + end + end + context 'when given an invalid locale' do + before do + get :index, params: { locale: :kjahdsf } + end + it 'should set to the default en locale' do + expect(I18n.locale).to eql(I18n.default_locale) + end + end + end end diff --git a/spec/features/ga_spec.rb b/spec/features/ga_spec.rb index 04eebcc2..e1b34219 100644 --- a/spec/features/ga_spec.rb +++ b/spec/features/ga_spec.rb @@ -1,5 +1,6 @@ require 'rails_helper' +# rubocop:disable Metrics/BlockLength describe "Google Analytics", type: :feature do before do visit map_path @@ -11,7 +12,27 @@ logo: { selector: '#logo a.logo-link', description: 'Logo link' }, program: { selector: 'a#hubzone-program-link', - description: 'Program link' } } + description: 'Program link' }, + help: { selector: 'a#map-help-guide', + description: 'Help Link' } } + + links.each do |_key, info| + it "should be ready to send an event for the #{info[:description]} link" do + link = find(:css, info[:selector]) + expect(link[:onclick]).to match(/HZApp.GA.openLink/) + end + end + end + + context "Help links" do + before do + visit help_path + end + + links = { help_overview: { selector: 'a#help-overview-link', + description: 'Help Overview Link' }, + help_faq: { selector: 'a#help-faq-link', + description: 'Help FAQ Link' } } links.each do |_key, info| it "should be ready to send an event for the #{info[:description]} link" do diff --git a/spec/features/help_page_spec.rb b/spec/features/help_page_spec.rb new file mode 100644 index 00000000..e5ea5970 --- /dev/null +++ b/spec/features/help_page_spec.rb @@ -0,0 +1,56 @@ +require 'rails_helper' + +describe "The Help Page", type: :feature do + before do + visit('/hubzone/map/help') + end + it "should have a 'Back to map' link " do + expect(page).to have_css("#back-to-map") + end + it "should have a side navigation" do + expect(page).to have_css(".usa-layout-docs-sidenav") + end + it "should have return to top links" do + expect(page).to have_css(".return-to-top") + end +end +describe "The Help Overview Page", type: :feature do + before do + visit('/hubzone/map/help') + end + it "should have a title" do + expect(page).to have_content("HUBZone Map Overview") + end + it "should have a Determining Elegibility section" do + expect(page).to have_css("#section-eligibility") + end + it "should have a Providing Documentation to SBA section" do + expect(page).to have_css("#section-reporting") + end + it "should have a Map Legend section" do + expect(page).to have_css("#section-map-legend") + end + it "should have a Advanced Features section" do + expect(page).to have_css("#section-advanced") + end +end +describe "The Help FAQ Page", type: :feature do + before do + visit('/hubzone/map/help/faq') + end + it "should have a title" do + expect(page).to have_content("Frequently Asked Questions") + end + it "should have question one" do + expect(page).to have_css("#section-faq-1") + end + it "should have question two" do + expect(page).to have_css("#section-faq-2") + end + it "should have question three" do + expect(page).to have_css("#section-faq-3") + end + it "should have question four" do + expect(page).to have_css("#section-faq-4") + end +end diff --git a/spec/features/map_header_spec.rb b/spec/features/map_header_spec.rb index 3b5ad827..4d15406b 100644 --- a/spec/features/map_header_spec.rb +++ b/spec/features/map_header_spec.rb @@ -16,6 +16,10 @@ expect(page).to have_content 'HUBZone Map' expect(page.find('.title-link')['aria-label']).to have_content 'hubzone map home' end + it "should have a Help link and aria label" do + expect(page).to have_css('#map-help-guide') + expect(page.find('#map-help-guide')['aria-label']).to have_content 'Help' + end it "should have HUBZone Program link and aria label" do expect(page).to have_content 'HUBZone Program' expect(page.find('#hubzone-program-link')['aria-label']).to have_content 'hubzone program' diff --git a/spec/features/map_legend_spec.rb b/spec/features/map_legend_spec.rb new file mode 100644 index 00000000..50de3738 --- /dev/null +++ b/spec/features/map_legend_spec.rb @@ -0,0 +1,51 @@ +require 'rails_helper' + +# rubocop:disable Metrics/BlockLength +describe "The Legend", type: :feature do + before do + visit('/map') + end + it "should have a title" do + expect(page).to have_content('Legend') + end + it "should have a qualification title" do + expect(page).to have_content('Qualified HUBZones') + end + it "should have a expiring title" do + expect(page).to have_content('Expiring HUBZones') + end + it "should have title, toggle, and symbol(s) for qct" do + expect(page).to have_content('Census Tract') + expect(page).to have_selector('input#qct') + expect(page).to have_css('.layer-qct') + end + it "should have title, toggle, and symbol(s) for qnmc" do + expect(page).to have_content('County') + expect(page).to have_selector('input#qnmc') + expect(page).to have_css('.layer-qnmc') + end + it "should have title, toggle, and symbol(s) for indian_lands" do + expect(page).to have_content('Indian Land') + expect(page).to have_selector('input#indian_lands') + expect(page).to have_css('.layer-indian_lands') + end + it "should have title, toggle, and symbol(s) for redesignated" do + expect(page).to have_content('Redesignated') + expect(page).to have_selector('input#redesignated') + expect(page).to have_css('.layer-qct_r') + expect(page).to have_css('.layer-qnmc_r') + end + it "should have title, toggle, and symbol(s) for brac" do + expect(page).to have_content('Closed Base Area') + expect(page).to have_selector('input#brac') + expect(page).to have_css('.layer-qct_brac') + expect(page).to have_css('.layer-qnmc_brac') + expect(page).to have_css('.layer-brac') + end + it "should have title, toggle, and symbol(s) for qda" do + expect(page).to have_content('Disaster Area') + expect(page).to have_selector('input#qda') + expect(page).to have_css('.layer-qct_qda') + expect(page).to have_css('.layer-qnmc_qda') + end +end diff --git a/spec/features/map_search_spec.rb b/spec/features/map_search_spec.rb index 9cd7a94f..5135932a 100644 --- a/spec/features/map_search_spec.rb +++ b/spec/features/map_search_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' # rubocop:disable Metrics/BlockLength -describe 'The Search', type: :feature, js: true do +RSpec.describe 'The Search', type: :feature, js: true do context 'before a search performed' do before do visit map_path @@ -35,7 +35,7 @@ lng: 0 } }, - query_date: Date.today + query_date: '2017-04-18' }, status: "hubzone_assertions.qualified" }, @@ -60,7 +60,7 @@ lng: 0 } }, - query_date: Date.today + query_date: '2017-04-18' }, status: "hubzone_assertions.qualified" }, @@ -76,7 +76,7 @@ lng: 0 } }, - query_date: Date.today + query_date: '2017-04-18' }, status: "hubzone_assertions.not_qualified" }, @@ -101,14 +101,14 @@ lng: 0 } }, - query_date: Date.today + query_date: '2017-04-18' }, status: "hubzone_assertions.qualified" } } %w(en dev).each do |locale| - context "in the #{locale} locale" do + context "in the #{locale} locale", vcr: true do before do I18n.locale = locale visit map_path(locale: locale) @@ -122,7 +122,7 @@ click_button 'hubzone-search-button' end - after(:each) do + after(:all) do Excon.stubs.clear end @@ -139,7 +139,7 @@ end it "should display the date of the search" do - expect(page).to have_content(t('hubzone_assertions.qualifications_effective') + I18n.l(Date.today, format: :full)) + expect(page).to have_content(t('hubzone_assertions.qualifications_effective') + I18n.l(Date.new(2017, 4, 18), format: :full)) end context "for any hubzone designations" do @@ -147,7 +147,9 @@ it "should contain the correct hubzone assertions" do expect(page).to have_content(t("hubzone_assertions." + hubzone[:hz_type].to_s)) end - + it "should have the right layer symbology" do + expect(page).to have_css(".layer-" + tquery[:response][:hubzone][0][:hz_type]) + end next unless hubzone[:expires] it "should show the correct language for expires or expired if expiration date is present" do expect(page).to have_content(hubzone[:expires] < Date.today ? t('hubzone_assertions.expired') : t('hubzone_assertions.expires')) diff --git a/spec/features/map_sidebar_spec.rb b/spec/features/map_sidebar_spec.rb index 7523f91a..7229db5b 100644 --- a/spec/features/map_sidebar_spec.rb +++ b/spec/features/map_sidebar_spec.rb @@ -36,6 +36,17 @@ 'St Paul St & E 25th St, Baltimore, MD 21218, USA', http_status: 200, hubzone: [], + geometry: { + location: { + lat: 0, + lng: 0 + } + } }, + redesignated: { formatted_address: + 'Reform, AL', + http_status: 200, + hubzone: [], + until_date: "2020-04-05", geometry: { location: { lat: 0, @@ -44,10 +55,10 @@ } } } before do - visit('/map') + visit(map_path) end - after(:each) do + after(:all) do Excon.stubs.clear end @@ -64,6 +75,12 @@ expect(page).to have_css(".hubzone-status-date") expect(page.find('.hubzone-status-date')['tabindex']).to be_truthy end + it "should have additional details title" do + expect(page).to have_content("Additional Details") + end + it "should have until date" do + expect(page).to have_css(".hubzone-until-date") + end end context "after a search performed", js: true do diff --git a/spec/javascripts/fixtures/hz_mock_page.html b/spec/javascripts/fixtures/hz_mock_page.html index 192bcb43..2c86e763 100644 --- a/spec/javascripts/fixtures/hz_mock_page.html +++ b/spec/javascripts/fixtures/hz_mock_page.html @@ -23,7 +23,7 @@