Skip to content

Commit

Permalink
Merge branch 'master' of github.com:spatialthoughts/courses
Browse files Browse the repository at this point in the history
  • Loading branch information
@spatialthoughts
spatialthoughts committed Aug 6, 2024
2 parents 9fa6a2f + b3bd9a7 commit f2a96fa
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 24 deletions.
50 changes: 28 additions & 22 deletions docs/gee-sign-up.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<title>Sign-up for Google Earth Engine</title>

<script src="site_libs/header-attrs-2.10/header-attrs.js"></script>
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
<script src="site_libs/header-attrs-2.21/header-attrs.js"></script>
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="site_libs/bootstrap-3.3.5/css/flatly.min.css" rel="stylesheet" />
<script src="site_libs/bootstrap-3.3.5/js/bootstrap.min.js"></script>
Expand Down Expand Up @@ -59,6 +59,7 @@




<style type = "text/css">
.main-container {
max-width: 940px;
Expand All @@ -80,6 +81,9 @@
summary {
display: list-item;
}
details > summary > p:only-child {
display: inline;
}
pre code {
padding: 0;
}
Expand Down Expand Up @@ -136,11 +140,15 @@
href = "index.html";
var menuAnchor = $('a[href="' + href + '"]');

// mark it active
menuAnchor.tab('show');

// if it's got a parent navbar menu mark it active as well
menuAnchor.closest('li.dropdown').addClass('active');
// mark the anchor link active (and if it's in a dropdown, also mark that active)
var dropdown = menuAnchor.closest('li.dropdown');
if (window.bootstrap) { // Bootstrap 4+
menuAnchor.addClass('active');
dropdown.find('> .dropdown-toggle').addClass('active');
} else { // Bootstrap 3
menuAnchor.parent().addClass('active');
dropdown.addClass('active');
}

// Navbar adjustments
var navHeight = $(".navbar").first().height() + 15;
Expand Down Expand Up @@ -169,25 +177,18 @@
border-radius: 4px;
}

.tabset-dropdown > .nav-tabs > li.active:before {
content: "";
.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
content: "\e259";
font-family: 'Glyphicons Halflings';
display: inline-block;
padding: 10px;
border-right: 1px solid #ddd;
}

.tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
content: "&#xe258;";
border: none;
}

.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
content: "";
content: "\e258";
font-family: 'Glyphicons Halflings';
display: inline-block;
padding: 10px;
border-right: 1px solid #ddd;
border: none;
}

.tabset-dropdown > .nav-tabs > li.active {
Expand Down Expand Up @@ -231,7 +232,7 @@
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-bs-toggle="collapse" data-target="#navbar" data-bs-target="#navbar">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand Down Expand Up @@ -296,8 +297,12 @@ <h3>FAQ</h3>
enable different services.</li>
<li><strong>Should I sign-up for a Cloud Project?</strong> As of June
2024, you do not have an option to use Earth Engine without a cloud
project. If you do not sign-up, your GEE account will stop functioning
at some point in the future.</li>
project. If you do not link your existing account with a Cloud Project,
your GEE account will stop functioning at some point in the future.</li>
<li><strong>What happens to my scripts and assets?</strong> Your
existing scripts and asset will remain in your account and you can
continue using them as normal after linking the account with a Cloud
Project.</li>
<li><strong>Do I have to pay for Google Cloud?</strong> Earth Engine
remains free for <a
href="https://earthengine.google.com/noncommercial/">Noncommercial and
Expand All @@ -322,7 +327,8 @@ <h3>Choose a Sign-up Method</h3>
href="https://code.earthengine.google.com">Earth Engine Code Editor</a>
and click on the account logo in the top-right corner and select
<em>Register a new Cloud Project</em>. This will start the <a
href="#sign-up-flow">Sign-up Flow</a>.</li>
href="#sign-up-flow">Sign-up Flow</a> that will connect your existing
account to a Cloud Project.</li>
</ul>
<p><img src="images/gee_sign_up/existing.png" width="75%" style="display: block; margin: auto auto auto 0;" /></p>
</div>
Expand Down
5 changes: 3 additions & 2 deletions gee-sign-up.Rmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ We have put together a simplified FAQ and step-by-step guide below for users who
### FAQ

* **Why the requirement for a Cloud Project?** Previously - Earth Engine was a separate Google service with it's own systems and was governed by its own Terms of Service. It is now integrated with Google Cloud Platform and is one of hundreds of other cloud offerings. This means that the usage of GEE is now governed by the *Google Cloud Platform Terms of Service* and it uses the standard cloud systems for access, logging, billing etc. It helps Earth Engine team offer better integration with other Google Cloud offerings. Using Google Cloud requires a *Project* - which is just a workspace where you can enable different services.
* **Should I sign-up for a Cloud Project?** As of June 2024, you do not have an option to use Earth Engine without a cloud project. If you do not sign-up, your GEE account will stop functioning at some point in the future.
* **Should I sign-up for a Cloud Project?** As of June 2024, you do not have an option to use Earth Engine without a cloud project. If you do not link your existing account with a Cloud Project, your GEE account will stop functioning at some point in the future.
* **What happens to my scripts and assets?** Your existing scripts and asset will remain in your account and you can continue using them as normal after linking the account with a Cloud Project.
* **Do I have to pay for Google Cloud?** Earth Engine remains free for [Noncommercial and Research Use](https://earthengine.google.com/noncommercial/). You do not need to setup a billing account or pay if you qualify for this category. For [Commercial Use](https://earthengine.google.com/commercial/), you will need to setup a billing account and choose a [Pricing Plan](https://cloud.google.com/earth-engine/pricing).

Ready sign-up for Earth Engine with a Cloud Project? Follow the steps below.
Expand All @@ -48,7 +49,7 @@ Ready sign-up for Earth Engine with a Cloud Project? Follow the steps below.
### Choose a Sign-up Method

* **First-time GEE Users**: Visit the [Project Registration Page](https://code.earthengine.google.com/register) to start the [Sign-up Flow](#sign-up-flow).
* **Existing GEE Users**: Visit the [Earth Engine Code Editor](https://code.earthengine.google.com) and click on the account logo in the top-right corner and select *Register a new Cloud Project*. This will start the [Sign-up Flow](#sign-up-flow).
* **Existing GEE Users**: Visit the [Earth Engine Code Editor](https://code.earthengine.google.com) and click on the account logo in the top-right corner and select *Register a new Cloud Project*. This will start the [Sign-up Flow](#sign-up-flow) that will connect your existing account to a Cloud Project.

```{r echo=FALSE, fig.align='left', out.width='75%'}
knitr::include_graphics('images/gee_sign_up/existing.png')
Expand Down

0 comments on commit f2a96fa

Please sign in to comment.